add powerline.vim
resolve conflicts