fix error after merge