the goal here is to have the same configuration as the users, with my normal
configuration especially git merge was extremely problematic. the prompt should
also be cleaned up so there is less clutter on the screen.