diff --git a/: b/:
deleted file mode 100644
index 7768c1527..000000000
--- a/:
+++ /dev/null
@@ -1,7 +0,0 @@
-Merge remote-tracking branch 'upstream/master'
-
-# Please enter a commit message to explain why this merge is necessary,
-# especially if it merges an updated upstream into a topic branch.
-#
-# Lines starting with '#' will be ignored, and an empty message aborts
-# the commit.
diff --git a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java
index 3e8fa7f64..3d526ec69 100644
--- a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java
+++ b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java
@@ -71,6 +71,7 @@ public class SparkCountryPropagationJob3 {
 		Class<? extends Result> resultClazz = (Class<? extends Result>) Class.forName(resultClassName);
 
 		SparkConf conf = new SparkConf();
+		conf.registerKryoClasses(ModelSupport.getOafModelClasses());
 
 		runWithSparkSession(
 			conf,
@@ -100,7 +101,7 @@ public class SparkCountryPropagationJob3 {
 			spark
 				.read()
 				.json(inputPath)
-				.as(Encoders.bean(resultClazz))
+				.as(Encoders.kryo(resultClazz))
 				.groupByKey((MapFunction<R, String>) result1 -> result1.getId(), Encoders.STRING())
 				.mapGroups(getCountryMergeFn(resultClazz), Encoders.bean(resultClazz))
 				.write()