resolve merge conflicts
devise with angular