I experienced the same when pulling system files after some time of not
upgrading. Also, I am pretty sure that I have not modified those files
listed as modified locally. I tried pull -s *, but it did not work at all.

Thanks,
Peter.