correctly test during merge