add ddd
modify merge