fixed effing profile picture
merge conflict