trying to fix safari
trying to fix safari with merge error