renaming and merging