save old edits
merge from github
solve problems with sublime problems