the vile first branch attempts to ruin the day with a merging conflict!!
Merge branch 'branch1'

Conflicts:
	branch_file.TXT