v.24.4Bug Fix

Cancel merges before removing moved parts #61610

Cancel merges before removing moved parts #61610 (János Benjamin Antal).