updated css stuff
updated conflict