Added gamestates
Fixed merge conflict