take new commits of implicit-git-rm
use implicit-git-rm
remove conflict mark
fix PS1

__git_ps1 is loaded when calling . /etc/bash_completion