fix merge issues

lib/config/localized_values.dart

@@ -1307,7 +1307,7 @@ const Map localizedValues = {
   "referralNumber": {
     "en": "Referral Number",
     "ar": "رقم الإحالة"
-  }
+  },
   "requestID": {
     "en": "Request ID",
     "ar": " رقم الطلب"

lib/pages/landing/home_page.dart

@@ -479,7 +479,7 @@ class _HomePageState extends State<HomePage> {
                         opacity: 0.5,
                       ),
                       DashboardItem(
-                        onTap: () =>  Navigator.push(context, FadePage(page: PharmacyPage())),
+                        //onTap: () =>  Navigator.push(context, FadePage(page: PharmacyPage())),
 
                         child: Center(
                           child: Padding(
@@ -677,7 +677,6 @@ class _HomePageState extends State<HomePage> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
                       DashboardItem(
-                        opacity:1.0,
                         child: Container(
                           width: double.infinity,
                           padding: EdgeInsets.all(10),

lib/routes.dart

@@ -57,7 +57,7 @@ var routes = {
   SYMPTOM_CHECKER_INFO: (_) => SymptomInfo(),
   SELECT_GENDER: (_) => SelectGender(),
   SETTINGS: (_) => Settings(),
-  APP_UPDATE: (_) => AppUpdatePage()
+  APP_UPDATE: (_) => AppUpdatePage(),
   SETTINGS: (_) => Settings(),
   HEALTH_WEATHER: (_)=> HealthWeatherIndicator()
 };