I messed up. Either I forgot to delete while copy-pasting, or someone made a mistake when merging. Anyway, this is done now.