Fixed import issue that was creating conflicts