fixing conflicts on css