diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 6594e4c39650..c20d420fb852 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -150,7 +150,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					withHashtags: ps.withHashtags,
 				}, me),
 			});
->>>>>>> develop
 
 			process.nextTick(() => {
 				this.activeUsersChart.read(me);