Fix merge problem in Cypher docs.