Will create merge conflict 1
Merge branch 'master' of github.com:ChasManRors/repo01

Conflicts:
	mergeconflict.txt

done fixing the merge with emacs