diff --git a/Gemfile b/Gemfile
index 0a71443..49f82d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,10 +15,7 @@ gem 'rgen'
 gem 'public_suffix', '<= 2.0.5'
 gem 'parallel', '<= 1.13.0'
 gem 'puppet-syntax', '~> 2.6', '>= 2.6.1'
-<<<<<<< HEAD
 gem 'pathspec', '~> 0.2.1'
-=======
->>>>>>> fff4fbb07cecdaeee187b4566e948ac1794dc6e8
 
 # rspec must be v2 for ruby 1.8.7
 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'