still trying to get conflict
Merge branch 'master' of https://github.com/pMaverick5/newGitTest
got it. The conflict seems to be resolved
Conflicts:
	test.html