solved old unnoticed conflict

Author: emmanuelle

doc/python/imshow.md

@@ -6,7 +6,7 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.2'
-      jupytext_version: 1.4.2
+      jupytext_version: 1.3.0
   kernelspec:
     display_name: Python 3
     language: python
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.7.7
+    version: 3.7.3
   plotly:
     description: How to display image data in Python with Plotly.
     display_as: scientific
@@ -452,8 +452,5 @@ fig.show()
 ```
 
 #### Reference
-<<<<<<< HEAD
-See https://plotly.com/python/reference/#image for more information and chart attribute options!
-=======
+
 See https://plotly.com/python/reference/image/ for more information and chart attribute options!
->>>>>>> doc-prod