quotes merge conflict resolution