fix import broken in merge