merge files fix in update manager