removing sqlite
devise user model
resolve merge conflicts