pseudo-reset to a previous commit, now master is relatively clean again