Messed up using rebase. Just re-added users controller