Merge conflicts with style
merged conflicts