merging latest version