missed a bit

src/UrlParams.ts

@@ -333,10 +333,7 @@ let urlParamCache: {
   hash?: string;
   params?: UrlParams;
 } = {};
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/livekit
 /**
  * Gets the url params and loads them from a cache if already computed.
  * @param search The URL search string
@@ -546,11 +543,7 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => {
     intentAndPlatformDerivedConfiguration,
   );
 
-<<<<<<< HEAD
   const params = {
-=======
-  return {
->>>>>>> origin/livekit
     ...properties,
     ...intentPreset,
     ...pickBy(configuration, (v?: unknown) => v !== undefined),

src/state/CallViewModel.ts

@@ -1693,11 +1693,7 @@ export class CallViewModel extends ViewModel {
     private readonly livekitRoom: LivekitRoom,
     private readonly mediaDevices: MediaDevices,
     private readonly options: CallViewModelOptions,
-<<<<<<< HEAD
-    public readonly livekitConnectionState$: Observable<ECConnectionState>,
-=======
     public readonly livekitConnectionState$: Behavior<ECConnectionState>,
->>>>>>> origin/livekit
     private readonly handsRaisedSubject$: Observable<
       Record<string, RaisedHandInfo>
     >,