Tiny bit more merge cleanup

It runs now!