change
Merge branch 'origin/foo_casey'

Conflicts:
	foo.txt
change2
Merge branch 'origin/foo_casey'