Three way merge redownloaded object with local modifications