fixing merge conflicts
adding friend profile view