answer css
merged css answer conflicts