resolve Gemfile.lock conflicts
resolve seed conflicts