conflict resolution

conflict resolution