Fixed lingering conflict. :/
Reverting whitespace changes.