renamed the package and added some better conflict handling