Merge conflict fix that got through