modify merge newms and old ms DiskManager.java