fixing the Gemfile.lock and resolving merge conflicts