will allow solving all conflicts at once FIX #2786 Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>