html and css
resolve conflicts