stash commits
pulls master, fixes conflicts