fix merge conflicts

.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

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
 }

build.common.gradle

@@ -120,3 +120,4 @@ android {
 repositories {
 }
 
+