fix conflict merge

Author: lohanidamodar

templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig

@@ -120,11 +120,11 @@ class {{ service.name | caseUcfirst }} : Service {
         {%~ endfor %}
         )
         {%~ if method.responseModel %}
-        val converter: (Any) -> {{ _self.resultType(sdk.namespace, method) }} = {
+        val converter: (Any) -> {{ method | returnType(spec, sdk.namespace | caseDot) | raw }} = {
         {% if method.responseModel == 'any' %}
             it
         {% else %}
-        {{ _self.resultType(sdk.namespace, method) }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
+        {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
         {% endif %}
         }
         {%~ endif %}

templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig

@@ -68,11 +68,11 @@ class {{ service.name | caseUcfirst }} : Service {
         {%~ endfor %}
         )
         {%~ if method.responseModel %}
-        val converter: (Any) -> {{ utils.resultTypeKt(sdk.namespace, method) }} = {
+        val converter: (Any) -> {{ method | returnType(spec, sdk.namespace | caseDot) | raw }} = {
         {% if method.responseModel == 'any' %}
             it
         {% else %}
-        {{ utils.resultTypeKt(sdk.namespace, method) }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
+        {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
         {% endif %}
         }
         {%~ endif %}