Add descriptions, perhaps that was triggering the failure

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>

test/unit/mock/profiles/dupe-controls/child/controls/child.rb

@@ -1,9 +1,6 @@
 control 'control-01' do
   title 'the title set in child'
-<<<<<<< HEAD
   description 'something'
-=======
->>>>>>> Get functional tests passing; ensure inheritance does not trip duplicate warning
   describe 'describe-01' do
     it { should include '01' }
   end

test/unit/mock/profiles/dupe-controls/simple/controls/duplicates.rb

@@ -1,6 +1,8 @@
 control 'dupe-01' do
   impact 1
   title 'dupe-01-title-one'
+  description 'something'
+
   desc 'collision', 'one'
   desc 'uniq-one', 'one'
 
@@ -12,6 +14,8 @@
 control 'dupe-01' do
   impact 0
   title 'dupe-01-title-two'
+  description 'something'
+
   desc 'collision', 'two'
   desc 'uniq-two', 'two'
 

test/unit/mock/profiles/dupe-controls/wrapper-block-include/controls/include.rb

@@ -1,19 +1,13 @@
 include_controls 'child' do
   control 'control-01' do
     title 'title set in wrapper-block-include, inside the block'
-<<<<<<< HEAD
     description 'something'
-=======
->>>>>>> Get functional tests passing; ensure inheritance does not trip duplicate warning
   end
 end
 
 control 'control-01' do
   title 'the title set in wrapper-block-include, outside the block'
-<<<<<<< HEAD
   description 'something'
-=======
->>>>>>> Get functional tests passing; ensure inheritance does not trip duplicate warning
   describe 'describe-01' do
     it { should include '01' }
   end

test/unit/mock/profiles/dupe-controls/wrapper-simple-include/controls/include.rb

@@ -2,10 +2,7 @@
 
 control 'control-01' do
   title 'the title set in wrapper-simple-include'
-<<<<<<< HEAD
   description 'something'
-=======
->>>>>>> Get functional tests passing; ensure inheritance does not trip duplicate warning
   describe 'describe-01' do
     it { should include '01' }
   end