api json object returns in function fpObj and also fixed some merge errors