[Misc] Fix Compile Error Issues
[Misc] Fix Merge Error