diff --git a/spec/config/config_spec.rb b/spec/config/config_spec.rb
index de5c1f755..270b3726b 100644
--- a/spec/config/config_spec.rb
+++ b/spec/config/config_spec.rb
@@ -4,6 +4,7 @@
 
 describe 'making sure the config is parsed as should' do
   
+<<<<<<< HEAD
   describe 'pod_url' do
     it 'should have a trailing slash' do
       APP_CONFIG[:pod_url].should == 'http://example.org/'