umm its telling me to
Merge remote-tracking branch 'origin/master'

Conflicts:
	baddie.pyc