some commit2
merge conflict
merge conflict
commit1