Now more files are merged and produced in a canonical fashion, which hopefully creates less or no delta in the future.