diff --git a/src/matrix/storage/idb/stores/TimelineEventStore.ts b/src/matrix/storage/idb/stores/TimelineEventStore.ts
index 6b1c854b..49892771 100644
--- a/src/matrix/storage/idb/stores/TimelineEventStore.ts
+++ b/src/matrix/storage/idb/stores/TimelineEventStore.ts
@@ -14,19 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-<<<<<<< HEAD:src/matrix/storage/idb/stores/TimelineEventStore.ts
-import {EventKey} from "../../../room/timeline/EventKey.js";
+import {EventKey} from "../../../room/timeline/EventKey";
 import { StorageError } from "../../common";
 import { encodeUint32 } from "../utils";
 import {KeyLimits} from "../../common";
 import {Store} from "../Store";
 import {TimelineEvent, StateEvent} from "../../types";
-=======
-import {EventKey} from "../../../room/timeline/EventKey";
-import { StorageError } from "../../common.js";
-import { encodeUint32 } from "../utils.js";
-import {KeyLimits} from "../../common.js";
->>>>>>> b01c3283 (convert EventKey to ts):src/matrix/storage/idb/stores/TimelineEventStore.js
 
 interface Annotation {
     count: number;