naming conflict issue has been fixed