Undoing a partial merge error