adding fugitive to solve merge ploblems