trying to repair some damage done my me

screwing around with Git and I messed up a merge
trying to fix it

Dockerfile

@@ -106,6 +106,7 @@ COPY kernels/R_big $CONDA_DIR/share/jupyter/kernels/R_big
 COPY kernels/ruby $CONDA_DIR/share/jupyter/kernels/ruby
 COPY kernels/python2 $CONDA_DIR/share/jupyter/kernels/python2
 COPY kernels/javascript $CONDA_DIR/share/jupyter/kernels/javascript
+COPY kernels/go $CONDA_DIR/share/jupyter/kernels/go
 COPY kernels/installers/dynamic* $CONDA_DIR/share/jupyter/kernels/installers/
 
 ################################################################################
@@ -131,7 +132,6 @@ ENV CONDA_DIR=/opt/conda \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8
 ENV PATH=$CONDA_DIR/bin:$PATH \
-<<<<<<< HEAD
     HOME=/home/$NB_USER \
     JUPYTER=/opt/conda/bin/jupyter
 
@@ -151,48 +151,22 @@ RUN yum -y install \
               /bin/bashbug \
               /usr/local/share/man/* \
               /usr/bin/gprof  \
-=======
-    HOME=/home/$NB_USER
-    JUPYTER=/opt/conda/bin/jupyter
-
-USER root
-# second layer RUN
-# RUN yum -y update \
-RUN yum -y install sudo gcc epel-release \
-    && echo "### second layer cleanup" \
-    && yum clean all \
-    && rm -rf /var/cache/yum \
-    && rpm --rebuilddb \
-    && rm /bin/bashbug \
-    && rm -rf /usr/local/share/man/* \
-    && rm /usr/bin/gprof  \
->>>>>>> 6f3bbabc623797535231c6f15b14190382a86e59
     && find /usr/share/terminfo -type f -delete \
     && chmod +x /tini \
     && echo "$NB_USER ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/notebook \
     && echo "### Creation of jovyan user account" \
     && useradd -s /bin/bash -N -u $NB_UID $NB_USER \
     && rm -rf $HOME 
-<<<<<<< HEAD
 
 # copy in built package from base layer
 COPY --chown=1000:100 --from=builder $CONDA_DIR $CONDA_DIR
 COPY --chown=1000:100 --from=builder $HOME $HOME
 
 # set startpoints
-=======
-#    && echo "### Moving home directory into place" \
-#    && mv $CONDA_DIR/$NB_USER /home/ 
-
-COPY --chown=1000:100 --from=builder $CONDA_DIR $CONDA_DIR
-COPY --chown=1000:100 --from=builder $HOME $HOME
-
->>>>>>> 6f3bbabc623797535231c6f15b14190382a86e59
 EXPOSE 80 443
 ENTRYPOINT ["/tini", "--"]
 USER $NB_UID
 WORKDIR $HOME
-<<<<<<< HEAD
 
 # start notebook
 CMD ["jupyter-notebook-insecure"]
@@ -207,7 +181,3 @@ ENV NBGALLERY_CLIENT_VERSION=8.0.0
 LABEL gallery.nb.version=$NBGALLERY_CLIENT_VERSION \
       gallery.nb.description="Centos-based Jupyter notebook server" \
       gallery.nb.URL="https://github.com/nbgallery/jupyter-centos"
-=======
-# start notebook
-CMD ["jupyter-notebook-insecure"]
->>>>>>> 6f3bbabc623797535231c6f15b14190382a86e59

README.md

@@ -40,7 +40,6 @@ docker run --rm -p 443:443 nbgallery/jupyter-centos
 ```
 
 The default entrypoint is [jupyter-notebook-secure](util/jupyter-notebook-secure), which will generate a self-signed certificate and then launch the jupyter notebook server under HTTPS with an automatically-generated [authentication token](http://jupyter-notebook.readthedocs.io/en/stable/security.html).
-<<<<<<< HEAD
 
 ## Development and testing of the image
 
@@ -51,5 +50,3 @@ docker run -p 8888:8888 -it jupyter-centos bash
 ```
 
 Will launch you into a bash prompt inside the container. The shortcut command `ji` will launch an insecure version of Jupyter that should be accessible on your system's `localhost:8888`
-=======
->>>>>>> 6f3bbabc623797535231c6f15b14190382a86e59