Merge with latest and revert 3 files.