Reinstated import guards
fixed conflict in import merge