Lost an import on the merge