Fixing merge conflict between "booktype/2.0" and "2.0"