merge rename