# Conflicts: # .idea/modules.xml # app/src/main/res/values/strings.xml
# Conflicts: # app/src/main/res/layout/title.xml
