modify
modify and merge