configuring portfolio page
fixing merge conflicts