I did add text a 2nd time
Merge branch 'new_branch_name'

Conflicts:
	afile.txt