Add fugitive
Resolve conflict