small changes to portfolio
fix merge conflicts