Fixed merge error and extra FA classes