it's hard to tell for the diff, but can you double check that all the files that were changed use spaces and not tabs.