nope, turns out I suck at mergetool. cleaned manifest