add code from merge