theme tag: accept "merge-top" tag again

Reported by Masafumi Yokoyama. Thanks!!!