Fixed sublime-settings merge error
Updated aliases