resolving renaming conflict