Style changes
Merge conflicts