Fixing merge issues with textbooks