fix conflict

diff --cc src/instr/instr_interface.cpp
Simple merge

diff --cc src/instr/instr_paje_values.cpp
index 2c4f8bd,587a076..9e60ab1
--- 1/src/instr/instr_paje_values.cpp
--- 2/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@@ -42,18 -27,18 +42,18 @@@ s_val::s_val(const char *name, const ch
  
    xbt_dict_set (father->values, name, ret, nullptr);
    XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
 -  LogEntityValue(ret);
 -  return ret;
 -}
 +  LogEntityValue(this->ret);
 +};
  
- val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
- {
+ val_t paje_value :: PJ_value_get_or_new (const char *name, const char *color, type_t father)
+ { paje_value pj_value;
    val_t ret = 0;
    try {
-     ret = PJ_value_get(name, father);
+     ret = pj_value.PJ_value_get(name, father);
    }
    catch(xbt_ex& e) {
 -    ret = pj_value.PJ_value_new(name, color, father);
 +    s_val rett(name, color, father);
 +    ret = rett.ret;
    }
    return ret;
  }

diff --cc src/instr/instr_private.h
Simple merge

diff --cc src/surf/instr_routing.cpp
index 827b7ad,039ed4c..7044975
--- 1/src/surf/instr_routing.cpp
--- 2/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@@ -401,9 -401,9 +401,9 @@@ void instr_new_user_state_type (const c
  }
  
  static void recursiveNewValueForUserStateType (const char *type_name, const char *value, const char *color, type_t root)
- {
+ { paje_value pj_value;
    if (not strcmp(root->name, type_name)) {
 -    pj_value.PJ_value_new (value, color, root);
 +    s_val PJ_value (value, color, root);
    }
    xbt_dict_cursor_t cursor = nullptr;
    type_t child_type;