fix conflicts

src/py/flwr/client/app.py

@@ -78,6 +78,17 @@ def _parse_args_client() -> argparse.ArgumentParser:
     parser.add_argument(
         "--server",
         default="0.0.0.0:9092",
+        help="Server address",
+    )
+    parser.add_argument(
+        "--callable",
+        help="For example: `client:flower` or `project.package.module:wrapper.flower`",
+    )
+    parser.add_argument(
+        "--callable-dir",
+        default="",
+        help="Add specified directory to the PYTHONPATH and load callable from there."
+        " Default: current working directory.",
     )
 
     return parser

src/py/flwr/client/typing.py

@@ -14,29 +14,8 @@
 # ==============================================================================
 """Custom types for Flower clients."""
 
-from dataclasses import dataclass
 from typing import Callable
 
-from flwr.client.workload_state import WorkloadState
-from flwr.proto.task_pb2 import TaskIns, TaskRes
-
 from .client import Client as Client
 
-
-@dataclass
-class Fwd:
-    """."""
-
-    task_ins: TaskIns
-    state: WorkloadState
-
-
-@dataclass
-class Bwd:
-    """."""
-
-    task_res: TaskRes
-    state: WorkloadState
-
-
 ClientFn = Callable[[str], Client]