Renaming conflict resolved