Merge Tyler's adjustments