fixed load screen and fixed the merge conflicts