Added merge info to PS1. Removed unstaged icon.