[Mercy] fixing merge error from 7277d9e6e7e8dd543e04e619ac78ff3fcb5568fe