typo
test edit
test edit on branch
trying to create a conflict
Merge branch 'master' into changes

Conflicts:
	copy.md