Fix conflicting import