fixing merge conflict in Gemfile.loc