# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/snapandsolve/MainScreen.kt