diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
new file mode 100644
index 00000000..e21693b8
--- /dev/null
+++ b/.github/workflows/actions.yml
@@ -0,0 +1,23 @@
+name: Build C++
+
+on:
+  push:
+    branches: "**"
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y -f build-essential g++ cmake
+  build:
+    needs: install
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build project
+        run: g++ -std=c++17 main.cpp
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..3b4c2a72
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+[![Build C++](https://github.com/msRaquel/MyFirstExample/actions/workflows/actions.yml/badge.svg)](https://github.com/msRaquel/MyFirstExample/actions/workflows/actions.yml)
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 5411e7a3..14514f64 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,10 +8,11 @@ using std::cout;
 int main()
 {
     cout << "THE FIRST EXAMPLE MATH DISPLAY!\n";
-    cout << "Hi, please enter two whole numbers: ";
+    cout << "Hi, please enter two whole numbers please: ";
 
     int x,y;
 
+<<<<<<< HEAD
     cin >> x >> y;
     cout << "Addition: " << x + y << endl;
     cout << "Subtraction: " << x - y << endl;
@@ -20,6 +21,17 @@ int main()
     cout << "Remainder: " << x % y << endl;
     cout << "Square Root: " << sqrt(x) << endl;
     cout << "Square: " << pow(x, y) << endl;
+=======
+    std::cin >> x >> y;
+    std::cout << "Addition: " << x + y << std::endl;
+    std::cout << "Subtraction: " << x - y << std::endl;
+    std::cout << "Multiplication: " << x * y << std::endl;
+    std::cout << "Division: " << x / y << std::endl;
+    std::cout << "Remainder: " << x % y << std::endl;
+    if(x = 0){ std::cout<<"Cannot divide by 0"<< std::endl;}
+    std::cout << "Square Root: " << sqrt(x) << std::endl;
+    std::cout << "Square: " << pow(x, y) << std::endl;
+>>>>>>> int32_error340
 
     return 0;
 }