Resolved merge conflicts

src/lib/queues/builder.ts

@@ -65,7 +65,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 	await asyncSleep(500);
 	await db.prisma.build.updateMany({
 		where: {
-			status: 'queued',
+			status: { in: ['queued', 'running'] },
 			id: { not: buildId },
 			applicationId,
 			createdAt: { lt: new Date(new Date().getTime() - 60 * 60 * 1000) }