Merge pull request conflict resolution