From 1a541f5528b49d66b0c6bbc0df11be218a5b4647 Mon Sep 17 00:00:00 2001
From: 12_Parsec <134395522+Hacker-lot@users.noreply.github.com>
Date: Mon, 14 Sep 2026 23:32:29 +0800
Subject: [PATCH 1/2] Add Conflate programming language entry

---
 concepts/conflate.scroll | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 concepts/conflate.scroll

diff --git a/concepts/conflate.scroll b/concepts/conflate.scroll
new file mode 100644
index 000000000000..8d06dd81512d
--- /dev/null
+++ b/concepts/conflate.scroll
@@ -0,0 +1,21 @@
+../code/conceptPage.scroll
+
+id conflate
+name Conflate
+appeared 2026
+tags pl
+website https://hacker-lot.github.io/conflate/
+description Conflate is an experimental polyglot programming language that combines Python, C++, Rust, Java, and Go blocks in one program, with shared values and optional typed inputs and outputs.
+fileExtensions confl
+writtenIn python
+isOpenSource true
+gitRepo https://github.com/Hacker-lot/conflate
+reference https://github.com/Hacker-lot/conflate/blob/main/docs/LANGUAGE.md
+
+example
+ @python(out: seed: int)
+ seed = 40
+ @cpp(in: seed: int; out: answer: int)
+ int answer = seed.as<int>() + 2;
+ @python(in: answer: int)
+ print(answer)

From 1a9cc76b06dfba974ba16eec3256ee542448ba58 Mon Sep 17 00:00:00 2001
From: 12_Parsec <134395522+Hacker-lot@users.noreply.github.com>
Date: Mon, 14 Sep 2026 23:51:07 +0800
Subject: [PATCH 2/2] Format Conflate entry with Scroll

---
 concepts/conflate.scroll | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/concepts/conflate.scroll b/concepts/conflate.scroll
index 8d06dd81512d..50acbddd36f9 100644
--- a/concepts/conflate.scroll
+++ b/concepts/conflate.scroll
@@ -8,8 +8,8 @@ website https://hacker-lot.github.io/conflate/
 description Conflate is an experimental polyglot programming language that combines Python, C++, Rust, Java, and Go blocks in one program, with shared values and optional typed inputs and outputs.
 fileExtensions confl
 writtenIn python
+
 isOpenSource true
-gitRepo https://github.com/Hacker-lot/conflate
 reference https://github.com/Hacker-lot/conflate/blob/main/docs/LANGUAGE.md
 
 example
@@ -19,3 +19,5 @@ example
  int answer = seed.as<int>() + 2;
  @python(in: answer: int)
  print(answer)
+
+gitRepo https://github.com/Hacker-lot/conflate