a new line in test.txt to test merge of branch
Merge branch 'dev1'

Conflicts:
	test.txt