diff --git a/RELEASE.txt b/RELEASE.txt
index 796ed90ed..9fac762e9 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -265,6 +265,13 @@ instead of the one included in our repo.
 
 Experimental support for building the detector client (including python bindings) on macOS
 
+<<<<<<< HEAD
+=======
+``rx_dbitlist`` keeps the order of the passed bit list 
+
+Detector.pattern (python) accepts also a pattern object, not only a pattern file
+
+>>>>>>> 06cd6c9eb (docstring and release)
 2  On-board Detector Server Compatibility
 ==========================================
 
diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py
index b8034cb3c..61f36a92c 100755
--- a/python/slsdet/detector.py
+++ b/python/slsdet/detector.py
@@ -3574,7 +3574,7 @@ class Detector(CppDetectorApi):
 
     @property
     def pattern(self):
-        """[Mythen3][Ctb][Xilinx Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
+        """[Mythen3][Ctb][Xilinx Ctb] Load a pattern (from file or memory) to the server (instead of executing line by line).
                
         :getter: Not Implemented