auto-round

706ac7e3 - Fix few merge errors (#1817)

Fix few merge errors (#1817) Signed-off-by: n1ck-guo <heng.guo@intel.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>