Try SublimeMerge for diff and merging
Add linters
Add path and rename extra