Is this how you yaml? I think this is how you yaml.
Merge remote-tracking branch 'origin/master'

Conflicts:
	desertbot/desertbot.py