KD: Change terminal prompt
KD: Add git merge tool