diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index bdddf8f..84f5a2a 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+<<<<<<< HEAD
 <<<<<<< HEAD
     <data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="633df7e7-7b9a-4298-8a3c-3075313a1153">
 =======
@@ -32,6 +33,16 @@
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
       <jdbc-url>jdbc:postgresql://172.20.96.1:5432/chauffageproj</jdbc-url>
 >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f
+=======
+    <data-source source="LOCAL" name="HegreConfort@localhost" uuid="755cf5bd-875b-416d-8bc2-76a5b9ba2d4d">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://localhost:3306/HegreConfort</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="database.introspection.mysql.dbe5060" value="true" />
+      </jdbc-additional-properties>
+>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>