title: Gemfile lock merge conflict
body: <p>I am performing a git pull from my master branch to one local machine with my application and it is giving me a merge conflict error in my Gemfile lock.</p>
  
  <p>How can i go about this?</p>