changed something
fixed merge conflict
Merge branch 'JunModified'

Conflicts:
	CHANGE ME.txt