after merging