Fiat-Chrysler merger still coming