Failed to merge conflict

[ChemicalKicks]

When I upgraded to the latest build available this was a merge that failed, is it okay to just dismiss this or should I update the template?

PHP Code:

Your Customized Value
<link rel="stylesheet" type="text/css" href="{vb:raw vbcsspath}threadlist.css" />
<title> {vb:raw vboptions.bbtitle}} - {vb:raw vboptions.arcadename} - {vb:raw game.title}</title>
Old Default Value
<link rel="stylesheet" type="text/css" href="{vb:raw vbcsspath}threadlist.css" />
<title>{vb:rawphrase x_powered_by_vbulletin, {vb:raw vboptions.bbtitle}} - {vb:raw vboptions.arcadename} - {vb:raw game.title}</title>
New Default Value
{vb:cssfile threadlist.css}
<title>{vb:rawphrase x_powered_by_vbulletin, {vb:raw vboptions.bbtitle}} - {vb:raw vboptions.arcadename} - {vb:raw game.title}</title> 


[KW802]

Looks like your modified version was to just change the page title. You'll want to make this change yet...

OLD:

<link rel="stylesheet" type="text/css" href="{vb:raw vbcsspath}threadlist.css" />

NEW:

{vb:cssfile threadlist.css}

... since the way of including the stylesheets has been changed in vB.

[ChemicalKicks]

Cheers