Resolve merge conflicts

the seperation of math and mathoid table was not merged correctly

Change-Id: I0f154bb4d34b972b0aee36c5edbbd64c31e014fa