modify2
modify2 and merge