Extra Wisdom

Fixed the merge conflict, but it seems to have added a bunch of whitespace.  Sorry.