change 2.txt's content
change content again
again
change on master branch
change on dev branch
solve conflicts
hello, Im dev
fix a bug
solve conflict
hh