users.coffee changed
Solving merge conflicts