diff --git a/ci/ext/post_package.d/create_index.sh b/ci/ext/post_package.d/create_index.sh
index 0cda7af..86d0470 100755
--- a/ci/ext/post_package.d/create_index.sh
+++ b/ci/ext/post_package.d/create_index.sh
@@ -12,45 +12,6 @@ mkdir -p $base_dir/ci/build/index-src
 # url for downloading released assets
 release_url="https://github.com/$TRAVIS_REPO_SLUG/releases/download"
 
-<<<<<<< Upstream, based on origin/master
-# iterate over each repo
-# iterate over each stack
-for stack in $(ls $base_dir/*/stack.yaml 2>/dev/null | sort)
-do
-    echo $stack
-    stack_dir=$(dirname $stack)
-
-    if [ -d $stack_dir ]
-    then
-        pushd $stack_dir
-
-        stack_id=$(basename $stack_dir)
-        stack_version=$(awk '/^version *:/ { gsub("version:","",$NF); gsub("\"","",$NF); print $NF}' $stack)
-        stack_version_major=`echo $stack_version | cut -d. -f1`
-        stack_version_minor=`echo $stack_version | cut -d. -f2`
-        stack_version_patch=`echo $stack_version | cut -d. -f3`
-
-        index_name=$stack_id-$stack_version-index
-
-        index_file_v2=$assets_dir/$index_name.yaml
-        index_file_local_v2=$assets_dir/$index_name-local.yaml
-        index_file_v2_temp=$assets_dir/$index_name-temp.yaml
-        nginx_file=$base_dir/ci/build/index-src/$index_name.yaml
-        
-        if [ -f $index_file_v2 ]; then
-            # Copy index file as we will update later
-            cp $index_file_v2 $index_file_v2_temp
-            
-            # Resolve external URL for local / github release
-            sed -e "s|${RELEASE_URL}/.*/|file://$assets_dir/|" $index_file_v2_temp > $index_file_local_v2
-            if [ "${BUILD_RELEASE}" == "true" ]; then
-                sed -e "s|${RELEASE_URL}/.*/|${RELEASE_URL}/${RELEASE_NAME}/|" $index_file_v2_temp > $index_file_v2
-            fi
-            rm -f $base_dir/ci/build/index-src/*.yaml
-            sed -e "s|${RELEASE_URL}/.*/|{{EXTERNAL_URL}}/|" $index_file_v2_temp > $nginx_file
-            rm -f $index_file_v2_temp
-       fi
-=======
 # iterate over each stack
 for stack in $(ls $base_dir/*/stack.yaml 2>/dev/null | sort)
 do
@@ -91,8 +52,7 @@ do
         fi
         
         popd
-        
->>>>>>> 60c8e4b Update to allow building of a released version of the stack
+
     else
         echo "SKIPPING: $repo_dir"
     fi
diff --git a/ci/ext/pre_env.d/pre_env.sh b/ci/ext/pre_env.d/pre_env.sh
index 88c191a..4809f7e 100755
--- a/ci/ext/pre_env.d/pre_env.sh
+++ b/ci/ext/pre_env.d/pre_env.sh
@@ -14,11 +14,7 @@ then
 fi
 if [ -z "${IMAGE_REGISTRY_ORG}" ]
 then
-<<<<<<< Upstream, based on origin/master
-    export IMAGE_REGISTRY_ORG="ICP4A"
-=======
     export IMAGE_REGISTRY_ORG="icpa"
->>>>>>> 60c8e4b Update to allow building of a released version of the stack
 fi
 if [ -z "${LATEST_RELEASE}" ]; then
     export LATEST_RELEASE=true
diff --git a/ci/list_artifacts.sh b/ci/list_artifacts.sh
index 99a7a28..3119ccb 100755
--- a/ci/list_artifacts.sh
+++ b/ci/list_artifacts.sh
@@ -17,8 +17,4 @@ do
 	echo "-------------------------------"
 	cat $index
 	echo "-------------------------------"
-<<<<<<< Upstream, based on origin/master
 done
-=======
-done
->>>>>>> 60c8e4b Update to allow building of a released version of the stack