set up devise migration for user
conflict resolved