merge in everything from goko-dominion-tools/automatch