add friend friend
merge and fix with friend