<h3><?php echo $this->translate('Conflicts Occurred') ?></h3>
<p><?php echo $this->translate('During the update some files were overwritten due to conflicts between the new version and an edited local version. Backups of the edited local versions have been made. Below is a list of the backed up files, you may need to manually merge your changes back into the new versions:') ?></p>
<ul>
<?php foreach ($this->conflicts as $file): ?> 
	<li><?php echo $file ?></li>
<?php endif; ?>
</ul>
