made pause scren sort of
pause screen
resolving merge conflict
moved pause to main