diff --git a/python/adjoint/objective.py b/python/adjoint/objective.py
index 9051f28eb..347aa824e 100644
--- a/python/adjoint/objective.py
+++ b/python/adjoint/objective.py
@@ -285,8 +285,12 @@ def place_adjoint_source(self, dJ):
                 center=self.volume.center,
                 **self.eigenmode_kwargs,
             )
+<<<<<<< HEAD
 
         else isinstance(self.mode, mp.DiffractedPlanewave):
+=======
+        elif isinstance(self.mode,mp.DiffractedPlanewave):
+>>>>>>> 9b8bf646 (whoops)
             source = mp.EigenModeSource(
                 src,
                 eig_band=new_dp,