Fix KM topic resolution

The TopicCreatingTopicResolver doesn't actually write them, apparently
Do awful correctness-checking manual topic merge