diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 1ff81aa1..cfb1a790 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -12,7 +12,6 @@
 * Fix DataUri scheme handler in image-loader (<GithubIssue id="74" />)
 * Introduced a "copy" builder for SpannableThem <br>Thanks <GithubUser name="c-b-h" />
 
-
 ## 2.0.0
 * Add `html-parser-api` and `html-parser-impl` modules
 * Add `HtmlEmptyTagReplacement`
diff --git a/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java b/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java
index bd583311..0b99d05c 100644
--- a/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java
+++ b/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java
@@ -208,7 +208,11 @@ public class SpannableBuilder implements Appendable, CharSequence {
     /**
      * This method will return all {@link Span} spans that <em>overlap</em> specified range,
      * so if for example a 1..9 range is specified some spans might have 0..6 or 0..10 start/end ranges.
+     * <<<<<<< HEAD:markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java
      * NB spans are returned in reversed order (not in order that we store them internally)
+     * =======
+     * NB spans are returned in reversed order (no in order that we store them internally)
+     * >>>>>>> master:markwon/src/main/java/ru/noties/markwon/SpannableBuilder.java
      *
      * @since 2.0.1
      */
diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java b/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
index 8186957f..f01df083 100644
--- a/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
+++ b/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
@@ -47,7 +47,7 @@ public class MarkwonTheme {
     public static MarkwonTheme create(@NonNull Context context) {
         return builderWithDefaults(context).build();
     }
-    
+
     /**
      * Create an <strong>empty</strong> instance of {@link Builder} with no default values applied
      * <p>