add friend list
merge