Remove merge conflicts fom Gemfile.lock