I think I commented on this before, but this file should not be touched by your change. You won't be able to merge this until you drop these files from your pull request.