merge finished to delivered