Convert to powerline for prompt
Fix some substitution in merge history