Fix conversion tables
Change default mercy border