Disabled git-gutter
Merge
Fixed merge