Recovered from driveway merge on master