fix error for merge