FIA and FSAA to merge in 2017