[boost] [git][predef] Pull fails

Hi, I checked out Boost on my Windows machine quite some time ago and today I tried to update it. I did: git submodule foreach git checkout develop git submodule foreach git pull The last command failed on Boost.Predef (log attached). I did not change it and I don't understand why there is conflict. I tried 'git reset --hard' and pull again, but it fails again the same way. How can I fix it?