Update DefaultRetrofitClientConfiguration.java

Author: marcingrzejszczak

spring-cloud-square-retrofit/src/main/java/org/springframework/cloud/square/retrofit/DefaultRetrofitClientConfiguration.java

@@ -39,6 +39,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.Qualifier;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.format.support.DefaultFormattingConversionService;
@@ -59,15 +60,14 @@ public Retrofit.Builder retrofitBuilder() {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(ConversionService.class)
 	public DefaultFormattingConversionService retrofitConversionService() {
 		return new DefaultFormattingConversionService();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(ConverterFactory.class)
 	public SpringConverterFactory springConverterFactory(ObjectFactory<HttpMessageConverters> messageConverters,
-			ConversionService conversionService) {
+			@Qualifier("retrofitConversionService") ConversionService conversionService) {
 		return new SpringConverterFactory(messageConverters, conversionService);
 	}