Some files that changed when a merge with ww3.