Formatting bugfix
Holy cow, we probably should have noticed that one sooner.
Fix conflicts