Fix import issue after merge