Update: testUpdateDeletedFileRemoteMergeConflict() and testUpdateDeletedFileLocalMergeConflict()