Ajax lock/unlock user
Merge conflict