rake task for users
conflict resolved