# Conflicts: # code/DiaryBottleApp/app/src/main/res/layout/search.xml
# Conflicts: # code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/MainActivity.kt