For future reference, you shouldn't have the extra whitespace (the four spaces that caused the diff). I went ahead and fixed it in the merge commit though.