v.24.7Bug Fix

Fix rare stuck merge issue after dropping a column

Fix rare case of stuck merge after drop column. #66707 (Raúl Marín).