It seems that SkyDrive "resolves" conflicts by appending -ComputerName to the end of a file. Therefore, we get errors like <pre>The located assembly's manifest definition does not match the assembly reference. (Exception from HRESULT: 0x80131040)</pre>. More on this in a bit.