diff --git a/main.py b/main.py
index 90425f3..f80a521 100644
--- a/main.py
+++ b/main.py
@@ -7,9 +7,14 @@
 
 def application_version():
     return "v1.0"
+
+def main():
+    print("welcome to inventory")
     
 if __name__=='__main__' :
-    pass
+    main()
+
+
 
-if __name__=='__main__':
-    pass
\ No newline at end of file
+if __name__ == "__main__":
+    main()
diff --git a/utils.py b/utils.py
index d8ea9e3..09a5dd5 100644
--- a/utils.py
+++ b/utils.py
@@ -6,5 +6,13 @@ def is_prime(number):
 
 def sum_of_prime_numbers(max):
     numbers = list(range(2, max+1))
+<<<<<<< HEAD
     prime_numbers = list(filter(is_prime, numbers))
     return sum(prime_numbers)
+=======
+    return sum(numbers)
+
+def fibbonaci(max):
+    fibbonaci = [1,1]
+    return fibbonaci
+>>>>>>> 290077d4e01c6431fd293c03058a0276eb5efb99