title: deleted merge conflicts in Gemfile.lock
body: <p>I would rather not be writing this. but the pain is, that I didn't know what the conflict was or whatever and i found it in the gemfile.lock and DELETED IT! and I read someone said not to do that..so i don't know how to fix my problem. Here is my gemfile, and gemfile.lock. </p>
  
  <p>-------->Gemfile&lt;---------- </p>
  
  <pre><code>source 'https://rubygems.org'
  
  
  
  ruby '2.2.6'
  
  git_source(:github) do |repo_name|
    repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
    "https://github.com/#{repo_name}.git"
  end
  
  
  gem 'rails', '~&gt; 5.0.1'
  gem 'puma', '~&gt; 3.0'
  gem 'sass-rails', '~&gt; 5.0'
  gem 'uglifier', '&gt;= 1.3.0'
  gem 'coffee-rails', '~&gt; 4.2'
  gem 'jquery-rails'
  
  
  gem 'jquery-ui-rails', '~&gt; 5.0.5'
  gem 'turbolinks', '~&gt; 5'
  gem 'jbuilder', '~&gt; 2.5'
  gem 'bootstrap', '~&gt; 4.0.0.alpha6'
  gem 'devise'
  gem 'activeadmin', '~&gt; 1.0.0.pre5'
  gem 'inherited_resources', github: 'activeadmin/inherited_resources'
  group :development, :test do
    gem 'byebug', platform: :mri
     gem 'sqlite3'
  end
  
  group :development do
    gem 'web-console', '&gt;= 3.3.0'
  end
  
  group :production do
      gem 'pg'
  end
  
  gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
  </code></pre>
  
  <p><strong>---------> Gemfile ends here &lt;--------</strong> </p>
  
  <pre><code>        GIT
         remote: https://github.com/activeadmin/inherited_resources.git
    revision: eea3aa21f3867dc182e4db24d1c765bdbcb3df34
    specs:
      inherited_resources (1.7.0)
        actionpack (&gt;= 3.2, &lt; 5.1)
        has_scope (~&gt; 0.6)
        railties (&gt;= 3.2, &lt; 5.1)
        responders
  
  GEM
    remote: https://rubygems.org/
    specs:
      actioncable (5.0.2)
        actionpack (= 5.0.2)
        nio4r (&gt;= 1.2, &lt; 3.0)
        websocket-driver (~&gt; 0.6.1)
      actionmailer (5.0.2)
        actionpack (= 5.0.2)
        actionview (= 5.0.2)
        activejob (= 5.0.2)
        mail (~&gt; 2.5, &gt;= 2.5.4)
        rails-dom-testing (~&gt; 2.0)
      actionpack (5.0.2)
        actionview (= 5.0.2)
        activesupport (= 5.0.2)
        rack (~&gt; 2.0)
        rack-test (~&gt; 0.6.3)
        rails-dom-testing (~&gt; 2.0)
        rails-html-sanitizer (~&gt; 1.0, &gt;= 1.0.2)
      actionview (5.0.2)
        activesupport (= 5.0.2)
        builder (~&gt; 3.1)
        erubis (~&gt; 2.7.0)
        rails-dom-testing (~&gt; 2.0)
        rails-html-sanitizer (~&gt; 1.0, &gt;= 1.0.3)
      activeadmin (1.0.0.pre5)
        arbre (~&gt; 1.0, &gt;= 1.0.2)
        bourbon
        coffee-rails
        formtastic (~&gt; 3.1)
        formtastic_i18n
        inherited_resources (~&gt; 1.6)
        jquery-rails
  </code></pre>
  
  <p><strong>-------->GEMFILE.LOCK ENDS HERE&lt;------------</strong></p>