test 2:wq
:wq
Merge branch 'master' of https://github.com/ambuj/newGitTest1

Conflicts:
	ABC.txt