DATACOUCH-652 - Resolve conflicts.

Author: jorgerod

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java

@@ -21,6 +21,8 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.couchbase.CouchbaseClientFactory;
 import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
+import org.springframework.data.couchbase.core.convert.translation.JacksonTranslationService;
+import org.springframework.data.couchbase.core.convert.translation.TranslationService;
 
 import com.couchbase.client.java.Collection;