Trouble merging recent changes from GIT repo

[degasus]

Yeah, our cmake will update them and the result is also tracked by git. imo broken design
Just use
git reset --hard
to reset them, after this, you can pull as usual.