work on game over and attempt on win modals
fixed merge issues