Awesome
Fixing merge conflict in novel.txt