Resolve app/views/projects/tree/show.html.haml

See:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3879#note_52648241

app/views/projects/tree/show.html.haml

@@ -6,12 +6,7 @@
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
 
-<<<<<<< HEAD
-%div{ class: [(container_class), ("limit-container-width" unless fluid_layout)] }
-  = render 'projects/last_push'
-=======
 = render 'projects/last_push'
 
 %div{ class: [(container_class), ("limit-container-width" unless fluid_layout)] }
->>>>>>> upstream/master
   = render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id)