Fixed a merge mistake and changed the PS1