merge and change