Add user following
Add user following wrong branch fix
master branch conflict.
config