fixed friends list view
fixing merge conflicts