accidentally committed stuff meant for a different branch: undo it