diff --git a/main.cpp b/main.cpp
index 065ac66..e8b69be 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,11 @@ 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;