[GREEN] Solve conflicts

lib/page/profile/profile.dart

@@ -109,7 +109,7 @@ class _ProfileState extends State<Profile> {
                       baseColor: Colors.grey[300],
                       highlightColor: Colors.grey[100],
                       enabled: _enabled,
-                      child: _createProfilePage(mockUser)),
+                      child: _createProfilePage(mockUser),
                 );
               case Status.error:
                 _enabled = false;