Redo on that last merge conflict fix
Yet another merge conflict fix