[merge] fix