Refactor truststore merger logic