diff --git a/tiramisu/setting.py b/tiramisu/setting.py
index 80bd064..b491d47 100644
--- a/tiramisu/setting.py
+++ b/tiramisu/setting.py
@@ -594,7 +594,6 @@ class Settings(object):
 
         # filters the callbacks
         calc_properties = set()
-<<<<<<< HEAD
         context = self._getcontext()
         for require in opt.impl_getrequires():
             expected = tuple(require.get_expected())
diff --git a/tiramisu/storage/sqlalchemy/option.py b/tiramisu/storage/sqlalchemy/option.py
index b3a9042..54c3256 100644
--- a/tiramisu/storage/sqlalchemy/option.py
+++ b/tiramisu/storage/sqlalchemy/option.py
@@ -36,6 +36,13 @@ SqlAlchemyBase = declarative_base()
 #____________________________________________________________
 #
 # require
+
+
+#_Base : object dans la base de donnée
+# => _RequireOption => il y a une liste d'espect dans _RequireExpected
+# => _PropertyOption => liste des propriétés
+# => _Information => dictionnaire avec clef valeur
+# => _CallbackParam avec des Options
 require_table = Table('require', SqlAlchemyBase.metadata,
                       Column('left_id', Integer, ForeignKey('requireoption.id')),
                       Column('right_id', Integer, ForeignKey('baseoption.id'))