# Conflicts:
#	booklore-api/src/main/java/com/adityachandel/booklore/service/user/DefaultUserSettingsProvider.java
#	booklore-ui/src/app/book/components/book-browser/book-browser.component.ts