diff --git a/modules/tagfaces/views/drawfaces_highlight_block.html.php b/modules/tagfaces/views/drawfaces_highlight_block.html.php
index e88adf51..c781b3ec 100644
--- a/modules/tagfaces/views/drawfaces_highlight_block.html.php
+++ b/modules/tagfaces/views/drawfaces_highlight_block.html.php
@@ -83,18 +83,14 @@
foreach ($existingFaces as $oneFace) {
$oneTag = ORM::factory("tag", $oneFace->tag_id)
?>
-<<<<<<< HEAD:modules/tagfaces/views/drawfaces_highlight_block.html.php
- tag_id") ?>" title="=p::clean($oneTag->name); ?>" alt="=p::clean($oneTag->name); ?>" onMouseOver="highlightbox(=$oneFace->x1 ?>,=$oneFace->y1 ?>,=$oneFace->x2 ?>,=$oneFace->y2 ?>,'=p::clean($oneTag->name); ?>', '=p::clean($oneFace->description); ?>', '=url::site("tags/$oneFace->tag_id") ?>')" />
-=======
- tag_id") ?>" title="=html::clean($oneTag->name); ?>" alt="=$oneTag->name; ?>" onMouseOver="highlightbox(=$oneFace->x1 ?>,=$oneFace->y1 ?>,=$oneFace->x2 ?>,=$oneFace->y2 ?>,'=html::clean($oneTag->name); ?>')" onMouseOut="hidebox()" />
->>>>>>> gallery3-contrib/master:modules/tagfaces/views/drawfaces_highlight_block.html.php
+ tag_id") ?>" title="=html::clean($oneTag->name); ?>" alt="=$oneTag->name; ?>" onMouseOver="highlightbox(=$oneFace->x1 ?>,=$oneFace->y1 ?>,=$oneFace->x2 ?>,=$oneFace->y2 ?>,'=html::clean($oneTag->name); ?>', '=html::clean($oneFace->description); ?>', '=url::site("tags/$oneFace->tag_id") ?>')" />
} ?>
// For each note, add a rectangle area to the page.
foreach ($existingNotes as $oneNote) {
?>
-
+
} ?>