Try to solve my mergin error