replace f1_plus_f2 with f1, f2
merge