add git branch info to prompt. unify prompt across all platforms (remove if block)
resolve merge conflict.