local while changes made on remote
anohter local commit
commit after merge conflict
commit to test diff
test diff