diff --git a/examples/Conditions/src/ConditionAnyExampleObjects.cpp b/examples/Conditions/src/ConditionAnyExampleObjects.cpp
index 0e537a3a1e0feb0c7be3b158ee7e9cb4222e41a1..c11656b7161ebaf8a20364b5055000900f7a9b10 100644
--- a/examples/Conditions/src/ConditionAnyExampleObjects.cpp
+++ b/examples/Conditions/src/ConditionAnyExampleObjects.cpp
@@ -79,6 +79,7 @@ void ConditionAnyUpdate2::resolve(Condition target, ConditionUpdateContext& cont
   vector<int>& c1 = cond1.as<vector<int> >();
   data.insert(data.end(), c1.begin(), c1.end());
 }
+<<<<<<< HEAD
 
 
 /// Interface to client Callback in order to update the condition