merge: remove drop_save() in favor of remove_merge_branch_state()