Changes to the merging of Zoe's and Tracy's scripts