Fix merged changed.