Fixed missing end keyword

app/controllers/projects/milestones_controller.rb

@@ -46,6 +46,7 @@ class Projects::MilestonesController < Projects::ApplicationController
     if @project.feature_available?(:burndown_charts, current_user) &&
         @project.feature_available?(:issue_weights, current_user)
       @burndown = Burndown.new(@milestone)
+    end
 
     respond_to do |format|
       format.html

app/views/layouts/nav/sidebar/_project.html.haml

@@ -239,14 +239,12 @@
               = sprite_icon('disk')
             %span.nav-item-name
               Registry
-<<<<<<< HEAD
           %ul.sidebar-sub-level-items.is-fly-out-only
             = nav_link(controller: %w[projects/registry/repositories], html_options: { class: "fly-out-top-item" } ) do
               = link_to project_container_registry_index_path(@project) do
                 %strong.fly-out-top-item-name
                   #{ _('Registry') }
-=======
->>>>>>> upstream/master
+
 
       - if project_nav_tab? :wiki
         = nav_link(controller: :wikis) do