merging conflict resolution