RENAME FOR LISTS AND CONFLICTS RESOLVED