Update sublime linter
merge and fix conflict