Fix error on merge in the imports