Master change for conflict