clean up

src/compas_viewer/scene/scene.py

@@ -79,18 +79,17 @@ def __init__(self, name: str = "ViewerScene", context: str = "Viewer"):
         self._instance_colors_generator = instance_colors_generator()
 
     @property
-<<<<<<< HEAD
     def viewer(self):
         from compas_viewer import Viewer
 
         return Viewer()
-=======
+
+    @property
     def observer(self):
         """Observer: The observer object for the scene."""
         if self._observer is None:
             self._observer = Observer()
         return self._observer
->>>>>>> 45eaaab56 (clean up)
 
     # TODO: These fixed kwargs could be moved to COMPAS core.
     def add(
@@ -195,10 +194,7 @@ def add(
             u=u,
             **kwargs,
         )
-<<<<<<< HEAD
-=======
         self.observer.request_update()
->>>>>>> 45eaaab56 (clean up)
         return sceneobject
 
     def remove(self, obj: ViewerSceneObject) -> None: