diff --git a/.gitignore b/.gitignore
index eb5a316..f6be2f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 target
+<<<<<<< HEAD
+=======
+.tool-versions
+>>>>>>> 089db26 ([feat] Create an evolution PoC model)
diff --git a/src/models/evolution.cairo b/src/models/evolution.cairo
index 12658c4..c9a6241 100644
--- a/src/models/evolution.cairo
+++ b/src/models/evolution.cairo
@@ -48,4 +48,4 @@ impl EvolutionImpl of EvolutionTrait {
             false => Result::Err('Evolution requirements not met'),
         }
     }
-}
\ No newline at end of file
+}