add test.txt
branch modify
commit
commit
commit test
merge conflicts