Created a conflict
merged changes in conflict
Merge branch 'master' of github.com:pcaspen/july17

Conflicts:
	file1.txt