Solve conflict

lib/home_screen.dart

 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 
 class HomeScreen extends StatefulWidget {
   _HomeScreenState createState() => _HomeScreenState();
@@ -40,7 +39,7 @@ class _HomeScreenState extends State<HomeScreen> {
                         mainAxisAlignment: MainAxisAlignment.center,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: <Widget>[
-                          Text('John Richardo'),
+                          Text('COVIDEFENDER', style: TextStyle(fontSize: 35.0, color: Colors.white)),
                           Text('20201190')
                         ],
                       )
@@ -66,9 +65,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/boralu.jpg')),
+                                            'lib/assets/images/man80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('My Profile', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -83,9 +82,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/mino.jpg')),
+                                            'lib/assets/images/map80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Map', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -100,9 +99,10 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/mino.jpg')),
+                                            'lib/assets/images/bar80.png')),
                                   )),
-                              Text('Personal Data',style: TextStyle(fontSize: 20.0))
+                              Text('Personal Data',style: TextStyle(fontSize: 20.0)),
+                              Text('QR Code', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -117,9 +117,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/boralu.jpg')),
+                                            'lib/assets/images/coach80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Intelligent Guider', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -134,9 +134,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/mino.jpg')),
+                                            'lib/assets/images/time80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Travelling History', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -151,9 +151,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/boralu.jpg')),
+                                            'lib/assets/images/event80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Event Risk Analyzer', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                     ],

pubspec.yaml

@@ -50,6 +50,12 @@ flutter:
     - lib/assets/images/top_header.jpg
     - lib/assets/images/mino.jpg
     - lib/assets/images/boralu.jpg
+    - lib/assets/images/map80.png
+    - lib/assets/images/man80.png
+    - lib/assets/images/bar80.png
+    - lib/assets/images/coach80.png
+    - lib/assets/images/time80.png
+    - lib/assets/images/event80.png
 
   # To add assets to your application, add an assets section, like this:
   # assets: