add friend feature
merge file