mergin with master