added stop game action
solved conflicts