diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 2a0ba43ea..7db4662ba 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -42,7 +42,7 @@ QVariant CSMWorld::IdTable::data  (const QModelIndex & index, int role) const
     if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable())
         return QVariant();
 
-    if (index.hasChildren())
+    if (hasChildren(index))
     {
         std::pair<int, int> parentAdress(unfoldIndexAdress(index.internalId()));
         return mIdCollection->getNestedData(parentAdress.first, parentAdress.second, index.row(), index.column());
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index cde5dc455..a01e59371 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -624,11 +624,7 @@ namespace CSMWorld
             virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index) const;
 
             virtual void setNestedData (const RefIdColumn *column, RefIdData& data, int index,
-<<<<<<< HEAD
                                         const QVariant& value, int subRowIndex, int subColIndex) const;
-=======
-                const QVariant& value, int subRowIndex, int subColIndex) const;
->>>>>>> 187fccc8cc630f1f469b4f5fc4e23a28ad8253ec
 
             virtual void setData (const RefIdColumn *column, RefIdData& data, int index,
                                   const QVariant& value) const;