First commit in test repository
second commit
another commit
commit after conflict