fixed merge to use os.system