name conflicts resolved