fixed merge conflicts, fixed new profile image