test in master
hello
test
Merge branch 'master' into my-branch

Conflicts:
	test.txt