styling recipe
merged style conflicts