fixed more merger code
still testing