fix conflicts

Author: vaneck237

.gitignore

@@ -81,4 +81,4 @@ fastlane/readme.md
 # Custom product flavours
 *custom-flavours.gradle
 
-.DS_Store
+.DS_Store

claimManagement/src/main/java/org/openimis/imisclaims/EnquireActivity.java

@@ -44,6 +44,7 @@
 
 import java.net.HttpURLConnection;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -301,6 +302,7 @@ public void renderResult(@Nullable Insuree insuree) {
         }
 
         ll.setVisibility(View.VISIBLE);
+        lv.setNestedScrollingEnabled(true);
 
         if (!etCHFID.getText().toString().trim().equals(insuree.getChfId()))
             return;
@@ -331,6 +333,7 @@ public void renderResult(@Nullable Insuree insuree) {
         }
 
         ArrayList<Map<String, String>> PolicyList = new ArrayList<>();
+        Collections.reverse(insuree.getPolicies());
         for (Policy policy : insuree.getPolicies()) {
             HashMap<String, String> policyMap = new HashMap<>();
             double iDedType = policy.getDeductibleType() != null ? policy.getDeductibleType() : 0;