Fix friend list
Merge