How to "force" a conflict resolution

Follow