fix missing imports after merge