Conflicted code doesn't look like a conflict

Was updating my forums from 3.0.5 to 3.0.6 and for all three forums the same dozen or so files came up as having a single conflict. As an example, here's one that was flagged:

<?php
/**
*

• @package acp
  <<<<<<< Begin of Conflict - Original File code before update
• @version $Id: acp_language.php,v 1.59 2007/10/14 15:46:07 acydburn Exp $
  ======= Code block used within the updated/new file
• @version $Id: acp_language.php 9669 2009-06-24 13:31:04Z leviatan21 $
  >>>>>>> End of Conflict
• @copyright (c) 2005 phpBB Group
• @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  */

Not sure why this would be a "conflict" as opposed to a modification.