Resolve conflicts

docs/en/observability/logs-filter.asciidoc

@@ -62,23 +62,14 @@ PUT _index_template/logs-example-default-template
 
 Filter your data using the fields you've extracted so you can focus on log data with specific log levels, timestamp ranges, or host IPs. You can filter your log data in different ways:
 
-<<<<<<< HEAD
-- <<logs-filter-logs-explorer>> – Filter and visualize log data in {kib} using Log Explorer.
-- <<logs-filter-qdsl>> – Filter log data from Dev Tools using Query DSL.
-=======
 - <<logs-filter-logs-explorer>> – Filter and visualize log data in {kib} using Logs Explorer.
 - <<logs-filter-qdsl>> – Filter log data from Developer tools using Query DSL.
->>>>>>> 0a1da4a9 (Update references to apps and pages (#4437))
 
 [discrete]
 [[logs-filter-logs-explorer]]
 === Filter logs in Log Explorer
 
-<<<<<<< HEAD
-Log Explorer is a {kib} tool that automatically provides views of your log data based on integrations and data streams. You can find Log Explorer in the Observability menu under *Logs*. 
-=======
 Logs Explorer is a {kib} tool that automatically provides views of your log data based on integrations and data streams. To open **Logs Explorer**, find `Logs Explorer` in the {kibana-ref}/introduction.html#kibana-navigation-search[global search field].
->>>>>>> 0a1da4a9 (Update references to apps and pages (#4437))
 
 From Log Explorer, you can use the {kibana-ref}/kuery-query.html[{kib} Query Language (KQL)] in the search bar to narrow down the log data displayed in Log Explorer.
 For example, you might want to look into an event that occurred within a specific time range.