removed extraneous import
merge fix