xmerge: Remove local variable name conflict

Change-Id: Id1708504934588c2e881bf249bc07bc61dc2c3c6
Reviewed-on: https://gerrit.libreoffice.org/10690
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>