add delivery receipt
fix conflict