Fixing some misc. styles
Fixing merge conflicts