Aligned to master

CHANGELOG.md

@@ -1,4 +1,6 @@
-<<<<<<< HEAD
+## x.y.z
+ - [DOC] described `executor_threads` configuration parameter [#421](https://github.com/logstash-plugins/logstash-input-beats/pull/421)
+
 ## 6.1.7
  - [DOC] Remove limitations topic and link [#428](https://github.com/logstash-plugins/logstash-input-http/pull/428)
 
@@ -10,10 +12,6 @@
 
 ## 6.1.4
  - Fix: reduce error logging on connection resets [#424](https://github.com/logstash-plugins/logstash-input-beats/pull/424)
-=======
-## x.y.z
- - [DOC] described `executor_threads` configuration parameter [#421](https://github.com/logstash-plugins/logstash-input-beats/pull/421)
->>>>>>> Put the description in correct order plus little extension to the description
 
 ## 6.1.3
  - Fix: safe-guard byte buf allocation [#420](https://github.com/logstash-plugins/logstash-input-beats/pull/420) 

docs/index.asciidoc

@@ -162,16 +162,8 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-add_hostname>> |<<boolean,boolean>>|No
 | <<plugins-{type}s-{plugin}-cipher_suites>> |<<array,array>>|No
 | <<plugins-{type}s-{plugin}-client_inactivity_timeout>> |<<number,number>>|No
-<<<<<<< HEAD
-<<<<<<< HEAD
 | <<plugins-{type}s-{plugin}-ecs_compatibility>> | <<string,string>>|No
-=======
 | <<plugins-{type}s-{plugin}-executor_threads>> |<<number,number>>|No
->>>>>>> added documentation for executor_threads
-=======
-| <<plugins-{type}s-{plugin}-ecs_compatibility>> | <<string,string>>|No
-| <<plugins-{type}s-{plugin}-executor_threads>> |<<number,number>>|No
->>>>>>> Put the description in correct order plus little extension to the description
 | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-include_codec_tag>> |<<boolean,boolean>>|No
 | <<plugins-{type}s-{plugin}-port>> |<<number,number>>|Yes
@@ -219,10 +211,6 @@ The list of ciphers suite to use, listed by priorities.
 
 Close Idle clients after X seconds of inactivity.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Put the description in correct order plus little extension to the description
 [id="plugins-{type}s-{plugin}-ecs_compatibility"]
 ===== `ecs_compatibility`
 
@@ -235,15 +223,6 @@ Close Idle clients after X seconds of inactivity.
 ** Otherwise, the default value is `disabled`.
 
 Refer to <<plugins-{type}s-{plugin}-ecs_metadata,ECS mapping>> for detailed information.
-=======
-[id="plugins-{type}s-{plugin}-executor_threads"]
-===== `executor_threads`
-
-  * Value type is <<number,number>>
-  * Default value is 1 executor thread per CPU core
-
-The number of parallel executor threads.
->>>>>>> added documentation for executor_threads
 
 [id="plugins-{type}s-{plugin}-executor_threads"]
 ===== `executor_threads`
@@ -384,3 +363,4 @@ The minimum TLS version allowed for the encrypted connections. The value must be
 include::{include_path}/{type}.asciidoc[]
 
 :default_codec!:
+