turns out a couple of files got added, and I forgot a merge artifact