manually merge relevant appkit files, I’m not sure of a good way
to do this but understand why dave made a new repo now