[Build] Fix missed git conflict and a build error
[Build] Fix missed git conflict and a build error