Review and merge?

Merge manually though (download it and replace all files).