fix merge_release