add to friend added in users list
conflicts removed