The conflict-resolution rebase incorrectly kept ISSUE_LOCK_FILE in the merged_cleanup_reconcile import, but that symbol was moved to issue_lock_provenance on master. This broke webui import collection. Fixes the reviewer-reported regression on PR #448.