Add user following
Fix conflict