Developer1: Merged master into acceptance
Developer2: will attempt to merge master into acceptance
Developer2: Got some changes from acceptance and master
Developer2: Manually pulled acceptance
Developer1: Successfully got changes from acceptance
Developer1: making a change
Merge branch 'master' into acceptance

Conflicts:
	developer2