merging problmes solved