From b6375e7a5d33a8e196e54795af61912c964eb03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Test=C3=A9?= <david.teste@fratris.fr>
Date: Thu, 16 Dec 2021 16:10:59 +0100
Subject: [PATCH] A conlficting comment with 'merge_with_two_commits' branch

---
 src/alphabets.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/alphabets.rs b/src/alphabets.rs
index 277326c..6559f3b 100644
--- a/src/alphabets.rs
+++ b/src/alphabets.rs
@@ -20,6 +20,10 @@ impl Alphabet for AsciiLowerCaseAlphabet {
     }
 }
 
+// A conflicting comment due to rebase
+// This above comment will cause problem since antoher branch has the same base and also
+// perfom a change here.
+
 #[derive(Debug, Eq, PartialEq)]
 pub struct IncompleteAscii;