merge import bug