Update CHANGES.rst -- resolve conflict

Author: juanmcloaiza

CHANGES.rst

@@ -16,6 +16,11 @@ esa.hubble
 
 - Removal of the deprecated ``query_hst_tap`` method, use ``query_tap`` instead. [#3367]
 
+eso
+^^^
+
+- Deprecated ``open_form`` and ``cache`` in query functions [#3339]
+
 gaia
 ^^^^
 
@@ -49,6 +54,15 @@ esa.euclid
   products. [#3313]
 - New cross-match method [#3386]
 
+eso
+^^^
+
+- Switch querying interface from WDB to TAP in querying functions. [#3339]
+- Allow plain ADQL queries via ``query_tap_service`` (with authentication as well). [#3339]
+- Cone search using ``cone_ra`, ``cone_dec`, ``cone_radius`` arguments. [#3339]
+- Retrieve record count before querying the archive, via ``count_only`` argument. [#3339]
+- Ask query functions to print the underlying ADQL queries without issuing them. [#3339]
+
 gaia
 ^^^^