diff --git a/main.cpp b/main.cpp
index e8b69be..8f0acd9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,11 +5,7 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-<<<<<<< HEAD
-    int a, b, MaxNumber, MinNumber;
-=======
     double a, b, MaxNumber, MinNumber;
->>>>>>> double
     cin >> a >> b;
     if (a > b){
         MaxNumber = a;