jerry-rigged merge to lower size, I'm bad at git