fix: merge error in a previous import