try powerline shell
revert to old powerline
delete merged branch alias