changed css
resolve conflicts