# Conflicts: # code/app/home/controller/Novel.php # code/app/model/NovelModel.php # code/extend/template/taglib/Site.php