fixed imports and a git history issue