fixing problems with mergin master