fixed mercys stuff