resolve name conflicts