Resolved conflicts b/w devise and user controller