That is really strange. I have heard of similar, but not identical issues with OneDrive. It appears it’s not particularly smart about synchronization. You can’t just resolve the conflict and it works then?
Can you perhaps send a screen shot of the OneDrive conflict message?