Add fugitive to addons for solving conflicts