diff --git a/.gitignore b/.gitignore
index edc5aef..bb9095b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,5 @@ change_dir.o
 update_check.o
 man.o
 calc.o
-<<<<<<< HEAD
 math_ext.o
-=======
->>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
 your-reality.o
\ No newline at end of file
diff --git a/math.o b/math.o
deleted file mode 100644
index 217e530..0000000
Binary files a/math.o and /dev/null differ