minor changes to portfolios controller in api
fix merge conflicts