Where conflicts are identified, they will be resolved.