first commit to develop. added file develop branch.txt
second commit to develop
added file with conflicts
Merge remote-tracking branch 'origin/develop'

Conflicts:
	file with conflict