diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index c68e7b13ec..2a0ba43ea4 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.internalId() != 0)
+    if (index.hasChildren())
     {
         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/refidadapter.hpp b/apps/opencs/model/world/refidadapter.hpp
index a07994544e..039f44a5ee 100644
--- a/apps/opencs/model/world/refidadapter.hpp
+++ b/apps/opencs/model/world/refidadapter.hpp
@@ -46,7 +46,7 @@ namespace CSMWorld
                                         const QVariant& value, int subRowIndex, int subColIndex) const = 0;
 
             virtual QVariant getNestedData (const RefIdColumn *column, const RefIdData& data,
-                                        int index, int subRowIndex, int subColIndex) const = 0;
+                                            int index, int subRowIndex, int subColIndex) const = 0;
 
             virtual int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const = 0;
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index a01e593712..cde5dc4550 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -624,7 +624,11 @@ 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;