this is new branch
merge newBranch to master

Conflicts:
	test.txt