fixed sizing of profile images
fixed merge conflict