added inactive
merge conflict
add to friend added in users list
conflicts removed
conflict removed