diff --git a/tangostationcontrol/requirements.txt b/tangostationcontrol/requirements.txt
index a91d36b356d0067b31852e7605655e4859f3f6cd..8d628544905096b9a717719b18bb25293bb0e72d 100644
--- a/tangostationcontrol/requirements.txt
+++ b/tangostationcontrol/requirements.txt
@@ -3,11 +3,7 @@
 # integration process, which may cause wedges in the gate later.
 
 importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
-<<<<<<< HEAD
 lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.9.2
-=======
-lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.9.1
->>>>>>> 9bda21fff53cf2fd9c95e97d415516c0b55628e6
 numpy
 mock
 asyncua >= 0.9.90 # LGPLv3