Manual merge - quest.txt