Fix merge conflict.

Author: ajoino

tests/test_homogeneous_collections.py

@@ -172,3 +172,10 @@ class TestSubModel(BaseXmlModel):
 
         class TestModel(BaseXmlModel):
             __root__: List[TestSubModel]
+
+    with pytest.raises(errors.ModelFieldError):
+        class TestSubModel(BaseXmlModel):
+            attr: int
+
+        class TestModel(BaseXmlModel):
+            text: List[TestSubModel]