updates sublime stuff
solved merge conflict