commit branch
commit test.txt
resolved conflict