changes
proortfolio page updated
merge conflicts are fixed