Remove --conflicts parameter as it seems useless