diff --git a/libbeat/processors/script/javascript/session.go b/libbeat/processors/script/javascript/session.go
index adfacd9214ad..36c80a91580a 100644
--- a/libbeat/processors/script/javascript/session.go
+++ b/libbeat/processors/script/javascript/session.go
@@ -209,7 +209,10 @@ func (s *session) runProcessFunc(b *beat.Event) (out *beat.Event, err error) {
 		if r := recover(); r != nil {
 			s.log.Errorw("The javascript processor caused an unexpected panic "+
 				"while processing an event. Recovering, but please report this.",
+<<<<<<< HEAD
 				"event", common.MapStr{"original": b.Fields.String()},
+=======
+>>>>>>> 3a504dd1e1 (Remove event fields from error log. (#37330))
 				"panic", r,
 				zap.Stack("stack"))
 			if !s.evt.IsCancelled() {