fix merge conflict problem with avatar on profile page
fix merge conflict problem with avatar on profile page

mlorb/scinote-web,Ducz0r/scinote-web,mlorb/scinote-web,Ducz0r/scinote-web,Ducz0r/scinote-web,mlorb/scinote-web