installed neobundle
modified conflict