modify conflict1.txt expecting conflict
Merge branch 'master' of https://github.com/mxieGit/RolTest

Conflicts:
	conflict1.txt