Follow style
Follow style
Sort is optional and false by default
Merge conflicts