diff --git a/main.cpp b/main.cpp
index 1bb6c43..a34f5fd 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, maximum, minimum;
+=======
+    double a, b, maximum;
+>>>>>>> double
     cin >> a >> b;
 
     if (a > b) {