commited file1.txt on mybranch.
changed file1 on master
changed file 1 on mybranch
fixed conflict