fixed ANA merge conflicts in feature test