# Conflicts: # app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java # app/src/main/res/drawable/standalone_button.xml