Is there enough tube to cut the flare off, remove the "wrong" fitting, replace the fitting and re-flare the tube? If so, take the tubes you have to them and just have them R&R the fitting(s).
If you go the adapter route, make sure you don't have two identical materials threading together, such as stainless to stainless.