fix incorrect sanity checks in -*-merge