Remove conflict resolution code.