modified sublime-settings
merge