updated merge script
bugfix autoRename & chrome unitsown table display