Changed how Cypher merges types