undo last commit, wait for upstream update