use git status -z instead?
use regex for branch ahead info
fix merge conflict