diff --git a/client/src/state.ts b/client/src/state.ts
index 1b3506b..a972820 100644
--- a/client/src/state.ts
+++ b/client/src/state.ts
@@ -25,8 +25,12 @@ export const state = reactive({
         source.addEventListener("open", () => console.debug("opened event source"))
         source.addEventListener('message', event => console.log(event))
         source.addEventListener('TickAdded', event => {
+<<<<<<< Updated upstream
             console.log(event)
             const tick: Tick = JSON.parse(event.data)
+=======
+            const tick: Tick = Tick.fromJSON(JSON.parse(event.data))
+>>>>>>> Stashed changes
             const tracks = this.tracks.map(track => {
                 if (track.id === tick.track_id) {
                     const ticks = track.ticks ?? []