current local changes, do not merge, abandoning this branch, redoing it better