Fixe Merciless Resolve

potirondb16_ESO

I was looking forward to that change, but it is a real pain now pls fix this for next week