worked on game code
mmerge error
things progress stuff yay