adding missing import after merge