diff --git a/.gitignore b/.gitignore
index cba7efc..6f313ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 a.out
+123456
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index bfc97fa..1cc6c2a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,13 +5,27 @@ int main()
         int a;
         int b;
 
+<<<<<<< HEAD
         std::cout << "a: ";
         std::cin >> a;
 
         std::cout << "b: ";
         std::cin >> b;
+=======
+        if (a < 0 || b < 0) {
+                std::cout << "Invalid numbers" << std::endl;
+                return -1;
+        }
+
+        if (a < 0 || b < 0) {
+                std::cout << "Invalid numbers" << std::endl;
+                return -1;
+        }
 
         std::cout << a << " + " << b << " = " << a + b << std::endl;
+>>>>>>> 4c05c65... Check for negative numbers
 
+        std::cout << a << " + " << b << " = " << a + b << std::endl;
+        std::cout << "My first commit" << std::endl;
         return 0;
 }
diff --git a/meme_for_you.jpg b/meme_for_you.jpg
new file mode 100644
index 0000000..618d00f
Binary files /dev/null and b/meme_for_you.jpg differ