It told me to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Level1.unity