merge with the newest version