Styling - merged conflicts