retest merge