manual merge, fix minor import issue