missing import after merge