added module incoming and delivery merge