Resolved merge conflicts

main.cpp

@@ -11,4 +11,5 @@ int main()
     << "A - B = " << a - b << '\n'
     << "A * B = " << a * b << '\n'
 
+
 }