mapping done
merge finished