Fix merge on mapping