Conflict resolution

conflict resolution