diff --git a/pioreactor/utils/pwm.py b/pioreactor/utils/pwm.py
index 8c68c183..1f99cbe9 100644
--- a/pioreactor/utils/pwm.py
+++ b/pioreactor/utils/pwm.py
@@ -178,17 +178,8 @@ def __init__(
         pubsub_client: Optional[Client] = None,
         logger: Optional[CustomLogger] = None,
     ) -> None:
-<<<<<<< Updated upstream
-        self.unit: str = unit or get_unit_name()
-        self.experiment: str = experiment or get_assigned_experiment_name(unit)
-=======
         self.unit = unit or get_unit_name()
-<<<<<<< Updated upstream
-        self.experiment = experiment or get_latest_experiment_name()
-=======
         self.experiment = experiment or get_assigned_experiment_name(self.unit)
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 
         if pubsub_client is None:
             self._external_client = False