resolved conflicts

src/main/java/net/gepafin/tendermanagement/util/Utils.java

@@ -303,4 +303,11 @@ public class Utils {
 	    return text.replace(target, replacement != null ? replacement : "");
 	}
 
+	public static String replaceSpacesWithUnderscores(String content) {
+		if (content == null) {
+			return null;
+		}
+		return content.trim().replace(" ", "_");
+	}
+
 }