diff --git a/abra.sh b/abra.sh
index d5126b9..dc327f4 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 export APP_ENTRYPOINT_VERSION=v1
-||||||| parent of 87367d9 (add backup capability)
-=======
 APP_DIR="app:/data"
 
 _backup_app() {
@@ -29,4 +26,3 @@ abra_backup_app() {
   _backup_app $APP_DIR
   success "Backed up 'app' to $ARK_FILENAME"
 }
->>>>>>> 87367d9 (add backup capability)