fix error from merge