[Merge] Fix merge issue