Maybe I have a setting somewhere set incorrect. But on two separate computers we have tried to use the unshelve + merge functionality. In all cases it changes the encoding of the file. I have tried using both the default merge utility as well as a third party merge tool, but the result always changes the encoding.