diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 000000000000..91a69d102926
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,26 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle
index 435e33a34ed9..82b25e556a7a 100644
--- a/TeamCode/build.gradle
+++ b/TeamCode/build.gradle
@@ -28,6 +28,10 @@ repositories {
 
 dependencies {
     implementation project(':FtcRobotController')
+<<<<<<< HEAD
     implementation 'org.ftclib.ftclib:core:2.1.1'
     implementation 'com.github.Eeshwar-Krishnan:PhotonFTC:v3.0.3-ALPHA'
+=======
+    implementation 'org.ftclib.ftclib:core:2.1.1' // core
+>>>>>>> c39806d95af8c69942505b9aab557891d3e51468
 }
diff --git a/build.common.gradle b/build.common.gradle
index 4e43a8c57e12..c9cb04d2237a 100644
--- a/build.common.gradle
+++ b/build.common.gradle
@@ -120,3 +120,4 @@ android {
 repositories {
 }
 
+