Master conflict resolved