-working in the branch
here i have added line to work on merge:wq!
merging
Merge branch 'vipinTest' into vipinTest2

Conflicts:
	test.txt