Fix merge error done by sharif