bundle update and create User table
merge conficted Gemfile.lock