diff --git a/frontend/src/concepts/pipelines/context/PipelinesContext.tsx b/frontend/src/concepts/pipelines/context/PipelinesContext.tsx
index c207859b15..c58d9c74b8 100644
--- a/frontend/src/concepts/pipelines/context/PipelinesContext.tsx
+++ b/frontend/src/concepts/pipelines/context/PipelinesContext.tsx
@@ -109,7 +109,7 @@ export const PipelineContextProvider = conditionalArea<PipelineContextProviderPr
     );
     if (DEV_MODE) {
       // Enables the use of this browser extension: https://github.com/SafetyCulture/grpc-web-devtools
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-function
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-function, @typescript-eslint/consistent-type-assertions
       const enableDevTools = (window as any).__GRPCWEB_DEVTOOLS__ || (() => {});
       enableDevTools([client]);
     }
diff --git a/frontend/src/concepts/projects/ProjectsContext.tsx b/frontend/src/concepts/projects/ProjectsContext.tsx
index 9acf1b3ef0..97ed7b2265 100644
--- a/frontend/src/concepts/projects/ProjectsContext.tsx
+++ b/frontend/src/concepts/projects/ProjectsContext.tsx
@@ -61,12 +61,8 @@ const isError = (obj: unknown): obj is Error =>
 const ProjectsContextProvider: React.FC<ProjectsProviderProps> = ({ children }) => {
   const [preferredProject, setPreferredProject] =
     React.useState<ProjectsContextType['preferredProject']>(null);
-<<<<<<< HEAD
-  const [projectData, loaded, loadError] = useProjects();
-=======
   const [projectData, loaded, error] = useProjects();
   const loadError = isError(error) ? error : undefined;
->>>>>>> 933956ee (first round of updates to disable type assertions)
   const { dashboardNamespace } = useDashboardNamespace();
 
   const { projects, dataScienceProjects, modelServingProjects, nonActiveProjects } = React.useMemo(