started Clash
basic behavior finished
key merge finished
some fixes for tests