diff --git a/main.cpp b/main.cpp
index 5411e7a..a61de01 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,8 @@
 #include <iostream>
 #include <cmath>
+using std::cin;
+using std::cout;
+using std::endl;
 
 using std::endl;
 using std::cin;
@@ -7,11 +10,31 @@ using std::cout;
 
 int main()
 {
+<<<<<<< HEAD
+  cout << "THE FIRST EXAMPLE MATH DISPLAY!\n";
+  cout << "Hi, please enter two whole numbers: ";
+=======
     cout << "THE FIRST EXAMPLE MATH DISPLAY!\n";
     cout << "Hi, please enter two whole numbers: ";
+>>>>>>> main
 
-    int x,y;
+  int x,y;
 
+<<<<<<< HEAD
+  cin >> x >> y;
+  cout << "Addition: " << x + y << endl;
+  cout << "Subtraction: " << x - y << endl;
+  cout << "Multiplication: " << x * y << endl;
+  if ( y== 0 ) {
+    cout << "Divding by zero is niot a number\n";
+  }
+  else { 
+    cout << "Division: " << x / y << endl;
+  }
+  cout << "Remainder: " << x % y << endl;
+  cout << "Square Root: " << sqrt(x) << endl;
+  cout << "Square: " << pow(x, y) << endl;
+=======
     cin >> x >> y;
     cout << "Addition: " << x + y << endl;
     cout << "Subtraction: " << x - y << endl;
@@ -20,6 +43,7 @@ int main()
     cout << "Remainder: " << x % y << endl;
     cout << "Square Root: " << sqrt(x) << endl;
     cout << "Square: " << pow(x, y) << endl;
+>>>>>>> main
 
-    return 0;
+  return 0;
 }