fix_merge