Fix merge on test