I have deleted that line
Made some changes to check about merge tool
Changes in the master branch to see merge tool
Merge branch 'branchtest'

Conflicts:
	samplefile