Fix merged stuff.