Correct some remainder of the merging progress from Desktop