undoing mistakes during merge