[merge] fix errors