add new line to test1.txt
add test2.txt
add new line to test.txt
qweqwewqe
Merge branch 'branch1'

Conflicts:
	test1.txt
Merge branch 'branch2'