First change, added change-1.txt
third change to get a conflict
merged changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	change-1.txt