diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
index 3677723c5eead0d1e580a7e64d84282f73df277a..edc9eebb6d619dd09de033ac2959b4858d263246 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
@@ -287,7 +287,6 @@ namespace armarx
                         activeSkillsAndPrefixes.insert(
                             {currentSkillId, statusForSkill.header.executorName});
                     }
->>>>>>>>> Temporary merge branch 2
                 }
             }
             catch (const std::exception& e)
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h
index ece37b918d96dbe5621ba3567ba69f663f91bed7..9106cb3192526f15355445deb0c6f1654921c17a 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h
@@ -27,7 +27,7 @@ namespace armarx
         static AronTreeWidgetItem* DynamicCast(QTreeWidgetItem*);
         static AronTreeWidgetItem* DynamicCastAndCheck(QTreeWidgetItem*);
 
-        const aron::type::VariantPtr aronType;
+        aron::type::VariantPtr aronType;
         // if editing the first column should be allowed
         const bool col0Editable = false;
         // if editing the second column should be allowed
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp
index 0c10124d58c35aec6e2658e69bf62174ca7a922c..a3d6f0ffd95e12011f977e3edaf477b7d2530a49 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp
@@ -9,7 +9,6 @@
 #include "../../ColorPalettes.h"
 #include "../visitors/AronTreeWidgetCreator.h"
 #include "NDArrayHelper.h"
-#include "visitors/AronTreeWidgetCreator.h"
 
 namespace armarx
 {