Hide first tag in merges with conflicts

Signed-off-by: Jacob Stopak <jacob@initialcommit.io>

git_sim/git_sim_base_command.py

@@ -53,6 +53,7 @@ def __init__(self):
 
         self.logo = m.ImageMobject(settings.logo)
         self.logo.width = 3
+        self.hide_first_tag = settings.hide_first_tag
 
         self.fill_opacity = 0.25
         self.ref_fill_opacity = 0.25
@@ -477,7 +478,7 @@ def draw_branch(self, commit, i, make_branches_remote=False):
     def draw_tag(self, commit, i):
         x = 0
 
-        if settings.hide_first_tag and i == 0:
+        if self.hide_first_tag and i == 0:
             return
 
         for tag in self.repo.tags:

git_sim/merge.py

@@ -113,6 +113,7 @@ def construct(self):
                 self.repo.active_branch.name, self.branch
             )
             if merge_result:
+                self.hide_first_tag = True
                 self.parse_commits(head_commit)
                 self.recenter_frame()
                 self.scale_frame()