Remove merge conflict from Gemfile