testing git reset merge
#
Merge branch 'master' of github.com:imranazad/try_git

Conflicts:
	file3.txt