diff --git a/Dockerfile b/Dockerfile
index fe5dadee..b04f8030 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,12 @@
 FROM ubuntu:18.04
 MAINTAINER PeerPlays Blockchain Standards Association
 
-<<<<<<< HEAD
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
-
-RUN \
-    apt-get update -y && \
-      DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      autoconf \
-      bash \
-=======
 ENV LANG=en_US.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive
 RUN \
     apt-get update -y && \
     apt-get install -y \
       autoconf \
->>>>>>> Docker file for Ubuntu 18.04
       build-essential \
       ca-certificates \
       cmake \
@@ -31,15 +19,12 @@ RUN \
       libreadline-dev \
       libssl-dev \
       libtool \
-<<<<<<< HEAD
       locales \
+      pkg-config \
       ntp \
       pkg-config \
       doxygen \
       ca-certificates \
-=======
-      ntp \
->>>>>>> Docker file for Ubuntu 18.04
       wget \
     && \
     apt-get clean && \
@@ -62,7 +47,7 @@ RUN \
 ADD . /peerplays-core
 WORKDIR /peerplays-core
 
-# Compile Peerplays
+# Compile Boost 
 RUN \
     git submodule update --init --recursive && \
     BOOST_ROOT=$HOME/boost_1_67_0 && \
@@ -71,7 +56,11 @@ RUN \
     cd boost_1_67_0/ && \
     ./bootstrap.sh "--prefix=$BOOST_ROOT" && \
     ./b2 install && \
-    cd .. && \
+    cd ..
+
+# Compile Peerplays
+RUN \
+    BOOST_ROOT=$HOME/boost_1_67_0 && \
     mkdir build && \
     mkdir build/release && \
     cd build/release && \