adding avatar upload to profile
fixing merge conflict due to whitespace