preliminary merge of canal
preliminary merge of mapping
continue merging mapping