added pathogen, gitgutter, etc
resolved conflict