added code for merge conflict resolution