Fix showConflict
Fix showConflict

use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <34c6fceca75e456f25e7e99531e2425c6c1de443@admin4.org>

endsguy/server,xx621998xx/server,xx621998xx/server,Ardinis/server,xx621998xx/server,pmattern/server,Ardinis/server,pixelipo/server,jbicha/server,endsguy/server,pixelipo/server,pmattern/server,nextcloud/server,jbicha/server,endsguy/server,pmattern/server,whitekiba/server,Ardinis/server,andreas-p/nextcloud-server,pmattern/server,pixelipo/server,andreas-p/nextcloud-server,michaelletzgus/nextcloud-server,Ardinis/server,whitekiba/server,andreas-p/nextcloud-server,andreas-p/nextcloud-server,michaelletzgus/nextcloud-server,xx621998xx/server,whitekiba/server,nextcloud/server,pixelipo/server,whitekiba/server,jbicha/server,michaelletzgus/nextcloud-server,xx621998xx/server,Ardinis/server,endsguy/server,michaelletzgus/nextcloud-server,whitekiba/server,endsguy/server,nextcloud/server,jbicha/server,nextcloud/server,jbicha/server,pixelipo/server,andreas-p/nextcloud-server,pmattern/server