diff --git a/.github/workflows/hacim.yml b/.github/workflows/hacim.yml
index de8bd87..2ecd3a1 100644
--- a/.github/workflows/hacim.yml
+++ b/.github/workflows/hacim.yml
@@ -1,31 +1,13 @@
 name: build_vdh_dashboard
 on:
-<<<<<<< HEAD
-  # schedule:
-  #   - cron: '0 21 * * 2,5' # Run on Tuesday and Friday 9pm UTC (5pm EST)
-=======
->>>>>>> ae04b738c7f88679aa0f548c6cdafa7cb334e95d
   push:
     branches:
         - main
   pull_request:
     branches:
         - main
-<<<<<<< HEAD
-
-# Cacnel previous runs if a new push is sent
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-  
 jobs:
   generate-dashboard:
-    # Don't run if a pull request but not closed
-    if: github.event_name == 'schedule' || ((github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == 'true') || github.event_name == 'push')
-=======
-jobs:
-  generate-dashboard:
->>>>>>> ae04b738c7f88679aa0f548c6cdafa7cb334e95d
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -43,13 +25,10 @@ jobs:
         with:
           repository: uva-bi-sdad/social_data_commons
           path: 'parent/social_data_commons'
-<<<<<<< HEAD
-=======
       - uses: actions/checkout@main
         with:
           repository: uva-bi-sdad/community_example
           path: 'parent/community_example'
->>>>>>> ae04b738c7f88679aa0f548c6cdafa7cb334e95d
       - name: Run tree
         run: |
           tree ..
@@ -65,15 +44,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ github.workspace }}/parent/social_data_commons/repos
-<<<<<<< HEAD
-          key: ${{ runner.os }}-repos
-          restore-keys: |
-            ${{ runner.os }}-repos
-=======
           key: ${{ runner.os }}-repos-${{ hashFiles('**/parent/social_data_commons/repos') }}
           restore-keys: |
             ${{ runner.os }}-repos-
->>>>>>> ae04b738c7f88679aa0f548c6cdafa7cb334e95d
       - run: echo "💡 The ${{ github.repository }} repository have been cloned to the runner."
       - name: Set up "data commons"
         working-directory: ${{ github.workspace }}/parent/social_data_commons
@@ -85,13 +58,6 @@ jobs:
           install.packages('remotes')
           remotes::install_github('uva-bi-sdad/community')
           source("build.R")
-<<<<<<< HEAD
-          datacommons_view(
-            "../social_data_commons", "${{ github.event.repository.name }}",
-            metadata = entities, entity_info = NULL
-          )
-=======
->>>>>>> ae04b738c7f88679aa0f548c6cdafa7cb334e95d
           renv::snapshot()
       - name: build ${{ github.event.repository.name }}
         working-directory: ${{ github.workspace }}/parent/${{ github.event.repository.name }}
@@ -107,11 +73,7 @@ jobs:
       - name: List files
         run: |
           ls -la
-<<<<<<< HEAD
-      - name: Commit files # Commit changes. You need to do this so child sites work...
-=======
       - name: Commit files # Commit changes
->>>>>>> ae04b738c7f88679aa0f548c6cdafa7cb334e95d
         working-directory: parent/${{ github.event.repository.name }}
         run: |
           ls -la
diff --git a/build.R b/build.R
index 7e2aa69..2b06263 100755
--- a/build.R
+++ b/build.R
@@ -1,6 +1,6 @@
 library(community)
 
-<<<<<<< HEAD
+
 data_add(
   c(
     district = "health_district.csv.xz",
@@ -20,17 +20,6 @@ data_add(
   ),
   dir = "./docs/data",
   clean = TRUE
-=======
-# make copy (could be "uva-bi-sdad/community_example" to get from repo)
-site_make_child("../community_example", "../vdh_rural_health_site", include = "docs/data/measure_info.json")
-
-# build site
-site_build(
-  "../vdh_rural_health_site", serve = TRUE, aggregate = TRUE,
-  parent = "https://uva-bi-sdad.github.io/community_example/",
-  endpoint = "https://vdh-data-commons.netlify.app/api",
-  tag_id = "G-WSQPEF0573"
->>>>>>> ae04b738c7f88679aa0f548c6cdafa7cb334e95d
 )
 
 # # clone/pull the data repositories