diff --git a/bash/src/pman.sh b/bash/src/pman.sh
index 4b3a83b..ddc7f3d 100644
--- a/bash/src/pman.sh
+++ b/bash/src/pman.sh
@@ -38,7 +38,7 @@ PMAN_TOOL_PMAIN=MAIN
 PMAN_TOOL_PDIST=DIST
 UPSTREAM_BASE=       ; UPSTREAM_MERGE_FROM=       ; UPSTREAM_MERGE_TO=DEVELOP ; UPSTREAM_PREL=    ; UPSTREAM_DELETE=
 DEVELOP_BASE=MAIN    ; DEVELOP_MERGE_FROM=FEATURE ; DEVELOP_MERGE_TO=MAIN     ; DEVELOP_PREL=from ; DEVELOP_DELETE=to
-MAIN_BASE=           ; MAIN_MERGE_FROM=DEVELOP    ; MAIN_MERGE_TO=DIST        ; MAIN_PREL=to      ; MAIN_DELETE=
+MAIN_BASE=DEVELOP    ; MAIN_MERGE_FROM=DEVELOP    ; MAIN_MERGE_TO=DIST        ; MAIN_PREL=to      ; MAIN_DELETE=
 DIST_BASE=MAIN       ; DIST_MERGE_FROM=MAIN       ; DIST_MERGE_TO=            ; DIST_PREL=        ; DIST_DELETE=
 FEATURE_BASE=DEVELOP ; FEATURE_MERGE_FROM=        ; FEATURE_MERGE_TO=DEVELOP  ; FEATURE_PREL=     ; FEATURE_DELETE=from
 
diff --git a/bin/_merge82 b/bin/_merge82
index ac4a192..7a4cac4 100755
--- a/bin/_merge82
+++ b/bin/_merge82
@@ -9,4 +9,4 @@ args=(
 )
 parse_args "$@"; set -- "${args[@]}"
 
-exec "$MYDIR/ptool" upstream -Bdev82 -m --tech-merge ${dev74:+-a "git checkout dev74"} "$@"
+exec "$MYDIR/ptool" -fupstream -Bdev82 -m --tech-merge ${dev74:+-a "git checkout dev74"} "$@"