why....
Merge remote-tracking branch 'origin/master'
merge worked
Merge branch 'master' of https://github.com/juesato/mario3sat.git
Merge branch 'master' of https://github.com/juesato/mario3sat.git
collisions