Resolved merge conflicts and completed merge

main.cpp

@@ -5,7 +5,11 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
+
+    double a, b;
+
     int a, b;
+
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
          << "A - B = " << a - b << '\n'
@@ -14,4 +18,5 @@ int main()
          << "Max(A, B) = " << max(a, b) << '\n'
          << "Min(A, B) = " << min(a, b) << '\n';
 
+    return 0;
 }

project.depend

@@ -0,0 +1,4 @@
+# depslib dependency file v1.0
+1743958712 source:c:\users\rybin\onedrive\desktop\lab02\alice\project\main.cpp
+	<iostream>
+