Removes merge conflict from Gemfile