Master conflict fix