diff --git a/main.cpp b/main.cpp
index a6dcaf2..2deb9b1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,6 +10,10 @@ int main()
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n'
+<<<<<<< HEAD
          << "max = " << max(a,b) << '\n'
          << "min = " << min(a,b) << '\n';
+=======
+         << "max = " << max(a,b) << '\n';
+>>>>>>> 6de9958f175fc0337d118c5a51adc58f510feb37
 }