Fix bad conflict resolution
Tweak whitespace for clarity