merging problem solved