diff --git a/source/conf.py b/source/conf.py
index 4391cb79ddc616573ff756aecb13bd47837ac55b..77e3cffb28901db9dd49cf6d224bb1040b1313b0 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -55,9 +55,9 @@ author = u'Edited by Marco Iacobelli'
 # built documents.
 #
 # The short X.Y version.
-version = u'24.2'
+version = u'24.3'
 # The full version, including alpha/beta/rc tags.
-release = u'24.2'
+release = u'24.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/source/datainspection.rst b/source/datainspection.rst
index 36046dc22a24b857c2c152dbd39f5ede7567f8ac..c432943e7ee6c3deb7ad4229309dad585206f649 100644
--- a/source/datainspection.rst
+++ b/source/datainspection.rst
@@ -14,12 +14,7 @@ where the **verbose** parameter allows you to have more detailed information abo
 
 + Python-casacore (formerly "pyrap") is a python interface to the casacore library, which allows the raw data tables (Measurement Sets) to be manipulated and the data plotted via python scripts. These allow you to customize what is plotted, and can be significantly faster than CASA for plotting large datasets. An extensive description of the python-casacore utilities is available `online <http://casacore.github.io/python-casacore/>`_.
 + Visibilities can be plotted relatively rapidly by making use of the combination of python-casacore and the plotting package PGPLOT, both of which work quickly. The script **uvplot.py** [#f2]_ can be used to plot visibility data and can be significantly faster than the PLOTMS task in CASA.
-<<<<<<< HEAD
-+ `CASA <http://casa.nrao.edu/>`_ is the python-based next generation replacement for AIPS/AIPS++ and can be used to display the data. Be aware that trying to inspect the raw visibilities with CASA will produce a "**segmentation fault**" error. To avoid this, you should make a copy of the dataset with DPPP (see the first example parset in Sect.~\ref{theparsetfile}). Moreover, when opening with CASA a MeasurementSet observed between May and October 2011,  you will get an **Unrecognised mount type** error [#f3]_. CASA has multiple functionalities that allows one to inspect different data products.
-=======
 + `CASA <http://casa.nrao.edu/>`_ is the python-based next generation replacement for AIPS/AIPS++ and can be used to display the data. Be aware that trying to inspect the raw visibilities with CASA will produce a "**segmentation fault**" error. To avoid this, you should make a copy of the dataset with DPPP (see the first example parset in Sect.~\ref{theparsetfile}). **Also note** that the Radio Observatory now stores the LOFAR data as Dysco compressed measurement sets and hence CASA cannot be used to inspect them. You must decompress the measurement set first if you want to use CASA for data inspection [#f6]_. Moreover, when opening with CASA a MeasurementSet observed between May and October 2011,  you will get an **Unrecognized mount type** error [#f3]_. CASA has multiple functionalities that allows one to inspect different data products.
->>>>>>> 7c916f800eedb02e44dc1fa3bc0b6a9441263e1f
-
     * **casabrowser** can be used to inspect the content of a Measurement Set. 
     * **casaplotms** can be used to visibility data against different parameters.
     * **casaviewer** can be used to inspect images.