Finish users
Resolve merge conflicts