woops, should have tried compiling that merge