update code resolve conflict

src/main/java/com/billpaymentservice/bbps/util/Helper.java

@@ -183,5 +183,14 @@ public class Helper {
 
 		return user;
 	}
+	
+	public <T> T convertJsonToObject(String json, Class<T> clazz) {
+	    try {
+	        return objectMapper.readValue(json, clazz);
+	    } catch (Exception e) {
+	        throw new CustomException("Invalid JSON from payment API", "FAILED", 400, json);
+	    }
+	}
+
 
 }