Fixing merge error
Implemented pause screen