merge conflicts
fix friend profile pic
pic fix