forgot to fix merge conflict in xpath.go