mergd with master