Finalize merge conflict resolution status

Co-authored-by: mrjf <180956+mrjf@users.noreply.github.com>

Author: Copilot