missing pieces from previous commit

Author: nicolaskruchten

Diff for: .circleci/create_conda_optional_env.sh

@@ -19,9 +19,5 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
 requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets
 
     # Install orca into environment
-<<<<<<< HEAD
     $HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca==1.3.1
-=======
-    $HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca==1.2.1
->>>>>>> doc-prod
 fi

Diff for: doc/python/heatmaps.md

@@ -81,11 +81,7 @@ fig.show()
 
 ### Heatmap with Categorical Axis Labels
 
-<<<<<<< HEAD
-In this example we also show how to ignore [hovertext](https://plot.ly/python/hover-text-and-formatting/) when we have [missing values](https://plot.ly/python/missing_values) in the data by setting the [hoverongaps](https://plot.ly/python/reference/#heatmap-hoverongaps) to False.
-=======
-In this example we also show how to ignore [hovertext](https://plotly.com/python/hover-text-and-formatting/) when we have [missing values](https://plotly.com/python/missing_values) in the data by setting the [hoverongaps](https://plotly.com/python/reference/#heatmap-hoverongaps) to False. 
->>>>>>> doc-prod
+In this example we also show how to ignore [hovertext](https://plotly.com/python/hover-text-and-formatting/) when we have [missing values](https://plotly.com/python/missing_values) in the data by setting the [hoverongaps](https://plotly.com/python/reference/#heatmap-hoverongaps) to False.
 
 ```python
 import plotly.graph_objects as go