Add simple undo-push
Fix merge conflict