Add conflict resolution code.