merge add friend to main