diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
index 9b88ec6..838c13a 100644
--- a/.github/workflows/cla.yaml
+++ b/.github/workflows/cla.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Alpha Release
-        uses: cla-assistant/github-action@v2.0.2-alpha
+        uses: cla-assistant/github-action@v2.0.3-alpha
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret
diff --git a/package/default/props.conf b/package/default/props.conf
index f662e15..e19c6ed 100644
--- a/package/default/props.conf
+++ b/package/default/props.conf
@@ -11,7 +11,6 @@ KV_MODE = NONE
 LEARN_SOURCETYPE = false
 LEARN_MODEL = false
 ANNOTATE_PUNCT = false
-SHOULD_LINEMERGE = false
 
 
 REPORT-fields = ta_cef_for_splunk_v0_fields, ta_cef_for_splunk_v0_cfields, ta_cef_for_splunk_v0_cfields_reverse,ta_cef_for_splunk_v0_flex_field,ta_cef_for_splunk_v0_flex_field_reverse,ta_cef_for_splunk_v0_deviceCustomDate_field
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 51b0534..2a27c3c 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -14,10 +14,10 @@ pytest-splunk-addon==1.4.0
 pytest-expect==1.1.0
 pytest-splunk-addon-ui-smartx==1.1.1
 pytest-rerunfailures==9.1.1
-mock==3.0.5
+mock==4.0.3
 requests==2.25.1
+six==1.15.0
 u-msgpack-python==2.7.1
-six==1.12.0
 coverage==5.3.1
 splunk-sdk==1.6.14
 future==0.18.2
diff --git a/requirements_py2_dev.txt b/requirements_py2_dev.txt
index 1e45305..d780492 100644
--- a/requirements_py2_dev.txt
+++ b/requirements_py2_dev.txt
@@ -7,4 +7,4 @@ lovely-pytest-docker
 pytest
 pytest-xdist
 pytest-expect
-mock==3.0.5
\ No newline at end of file
+mock==4.0.3
\ No newline at end of file
diff --git a/tests/knowledge/test_addon.py b/tests/knowledge/test_addon.py
index 872c464..df4ce2f 100644
--- a/tests/knowledge/test_addon.py
+++ b/tests/knowledge/test_addon.py
@@ -11,6 +11,3 @@
 class Test_App(Basic):
     def empty_method(self):
         pass
-
-
-