# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java # app/src/main/res/layout/activity_main.xml