Conflict renaming works