diff --git a/configs/config_test.json b/configs/config_test.json
index 5b128f0ab9086647ce53383f110fff56f5d427f9..9a9f1f9460079dda0572c21a059430c748a7c28c 100644
--- a/configs/config_test.json
+++ b/configs/config_test.json
@@ -1 +1,5 @@
-{"thingId": "s3i:b6d1cc6d-896c-40fe-9403-b5b7682b1d03", "policyId": "s3i:b6d1cc6d-896c-40fe-9403-b5b7682b1d03", "attributes": {"class": "ml40::Thing", "name": "test", "roles": [{"class": "fml40::Harvester"}], "features": [{"class": "fml40::ProvidesProductionData"}, {"class": "fml40::AcceptsFellingJobs"}]}}
\ No newline at end of file
+<<<<<<< HEAD
+{"thingId": "s3i:b6d1cc6d-896c-40fe-9403-b5b7682b1d03", "policyId": "s3i:b6d1cc6d-896c-40fe-9403-b5b7682b1d03", "attributes": {"class": "ml40::Thing", "name": "test", "roles": [{"class": "fml40::Harvester"}], "features": [{"class": "fml40::ProvidesProductionData"}, {"class": "fml40::AcceptsFellingJobs"}]}}
+=======
+{"thingId": "s3i:af86ad33-63a4-427b-9914-3f199cd025c4", "policyId": "s3i:af86ad33-63a4-427b-9914-3f199cd025c4", "attributes": {"class": "ml40::Thing", "name": "test", "roles": [{"class": "fml40::Harvester"}], "features": [{"class": "fml40::ProvidesProductionData"}, {"class": "fml40::AcceptsFellingJobs"}]}}
+>>>>>>> 0d577bac3a3ae43fd629d56880417b19316cd9c0
diff --git a/dt_creation_hmi.py b/dt_creation_hmi.py
index dd64dff6f6394b477917faf58ed4855ed6b9115b..1242d590446025e240e4c78b67eb20c96462709c 100644
--- a/dt_creation_hmi.py
+++ b/dt_creation_hmi.py
@@ -4,6 +4,7 @@
 from ml.tools import find_broker_endpoint, make_config_file, load_config
 from ml.dt_factory import create_dt_ref
 from ml.fml40.features.properties.values.documents.jobs.felling_job import FellingJob
+from ml.identifier import ID
 import requests
 import json, time
 
@@ -30,6 +31,7 @@
 job_proxy.identifier = "s3i:d53e84fd-432c-4e19-9008-546f296c2d5c"
 print(job_proxy.to_json().get())
 
+
 serv_req.fillServiceRequest(
     senderUUID=hmi_id, receiverUUID=[receiver], sender_endpoint=hmi_endpoint,
     serviceType="AcceptsFellingJobs/queryJobStatus",
diff --git a/ml/fml40/features/properties/values/documents/jobs/felling_job.py b/ml/fml40/features/properties/values/documents/jobs/felling_job.py
index ae21fecc2ebfd829f362b83a1ad10b4995e65d28..f2588cc6c8f391a2cb59e6b8cd1577c1de1381db 100644
--- a/ml/fml40/features/properties/values/documents/jobs/felling_job.py
+++ b/ml/fml40/features/properties/values/documents/jobs/felling_job.py
@@ -6,3 +6,5 @@ def __init__(self, name, ref_managing_actor):
         super(FellingJob, self).__init__(
             name=name, ref_managing_actor=ref_managing_actor
         )
+
+
diff --git a/requirements.txt b/requirements.txt
index af0299b9b06171a22d3a7350437268b5430acfc1..3152cdd778177e87bef3a47a92f6f60419276be1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,8 @@
 https://git.rwth-aachen.de/kwh40/s3i/-/jobs/artifacts/master/raw/public/s3i-0.4-py3-none-any.whl?job=wheel
 Pykka
-websocket
+websocket-client==0.57.0
 pynput
 opcua
 requests
 asyncio
 pylint==2.4.4
-#https://git.rwth-aachen.de/kwh40/s3i/-/jobs/758151/artifacts/raw/public/s3i-0.4-py3-none-any.whl