merge math fix