removed code from merge

removed code from merge