resolve merge with users
Merge with develop