Fixing conflicts in css