merge and add code