The formatting in this file seems all messed up now, maybe due to mixed spaces and tabs? For this file I think it would be best to roll bask the formatting changes and just manually convert the spaces to tabs in the few parts that were edited.