Style changes
Resolve merge conflicts