add git aware prompt
merge