fixed minor importing errors from merging