solve merging problem