fix merge on views