fix error and rebaseline