Fix merge conflict
Merge branch 'master' of github.com:zpon/simple-book-library