zzzz4
new text
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	New Text Document.txt