import customers into fa
conflict resolved