Revert "specify subtree merge"

that sort-of-works, but adds the prefix instead of removing it

This reverts commit 9ddc6f7e7f9b434497485d152f9b85cda913100a.