diff --git a/CHANGELOG.md b/CHANGELOG.md
index d85e76b..024f16a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ We follow [Semantic Versions](https://semver.org/).
 
 ## unreleased
 
+Fix `git.blame-copy` in case if merge conflict between files occurs.
+
 ## 1.0.0
 
 First stable release
diff --git a/saritasa_invocations/git.py b/saritasa_invocations/git.py
index 2da96ff..02e01d2 100644
--- a/saritasa_invocations/git.py
+++ b/saritasa_invocations/git.py
@@ -196,7 +196,14 @@ def _merge_commits(
     message: str,
 ) -> None:
     """Merge passed commits."""
-    context.run(f"git merge {' '.join(commits)} -m '{message}'")
+    context.run(
+        f"git merge {' '.join(commits)} -m '{message}'",
+        warn=True,
+    )
+    # create commit in case if merge conflict occurs
+    context.run(
+        f"git commit --no-verify -a -n -m '{message}'",
+    )
 
 
 def _move_file(