Chage on my_new_feature branch to cause a conflict.
Merge branch 'my_new_feature'

Conflicts:
	test.txt