merging solved