Yes, they settled, by agreeing not to bring charges against each other. Geoff Edgers provides the Before and After photos (or should that be: During and After?).