Oops. This is the right merge conflict fix.