Fixed missed conflict

app/assets/javascripts/merge_request_widget.js.coffee

@@ -72,15 +72,11 @@ class @MergeRequestWidget
         @firstCICheck = false
         @opts.ci_status = data.status
 
-<<<<<<< a918e8bf277418048776a5d9c34a64b39f4e56f3
       if @opts.ci_status is ''
         @opts.ci_status = data.status
         return
 
-      if data.status isnt @opts.ci_status
-=======
       if data.status isnt @opts.ci_status and data.status?
->>>>>>> Build notification null check
         @showCIStatus data.status
         if data.coverage
           @showCICoverage data.coverage