portfolio page
fix conflicts