Pitch styles
Resolve merge conflicts