made sure all music worked properly, switch pause screen from gameobject to guitecture.
Fixed merge conflicts