fix flow_merge_conflict