Thanks! But those two files are binary-identical, so there shouldn’t be any conflict at all.
I wasn’t clear before so I apologise: I need a copy of those files at the point you see the error. If you stop the editor and do a normal VC compile then the first file will be overwritten and there will be no more conflict.
If you get the error again, could you repost those files here before doing anything else, please?
Thanks,
Steve