Replaced Powerline with the Previous Version
Merge