diff --git a/test/unit/article_block_test.rb b/test/unit/article_block_test.rb
index 2fa2c16..7547c92 100644
--- a/test/unit/article_block_test.rb
+++ b/test/unit/article_block_test.rb
@@ -51,7 +51,6 @@ class ArticleBlockTest < Test::Unit::TestCase
     assert_nil block.article_id
   end
 
-<<<<<<< HEAD
   should "take available articles with a person as the box owner" do
     person = create_user('testuser').person
     person.articles.delete_all
--
libgit2 0.21.2