first commit
second commit
Merge conflict resolution