change MASTER - conflict