Friend list
Fix some strange error that happened in the merge of friend list