Looks like another weird conflict, I am not sure how to resolve:
Looks like entire file is replaced again?
Is it something I did?
There should not be the whole file changed, just some lines.
Is it maybe again this eol-style thingy?