diff --git a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG
index d72af3146..b41fd4b11 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG
+++ b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG
@@ -1 +1,36 @@
-asd
+Merge branch 'develop' into other_branch
+
+# Conflicts:
+# directory/file
+# directory/file2
+# file1
+# file3
+# file4
+# file5
+#
+# It looks like you may be committing a merge.
+# If this is not correct, please remove the file
+# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflicts/actual/.git/MERGE_HEAD
+# and try again.
+
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch other_branch
+# All conflicts fixed but you are still merging.
+#
+# Changes to be committed:
+# new file: cherrypicking1
+# new file: cherrypicking2
+# new file: cherrypicking3
+# new file: cherrypicking4
+# new file: cherrypicking5
+# new file: cherrypicking6
+# new file: cherrypicking7
+# new file: cherrypicking8
+# new file: cherrypicking9
+# modified: file1
+# modified: file4
+# modified: file5
+#
diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD
index 49b9c3b53..21c1550a1 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD
+++ b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD
@@ -1 +1 @@
-e00ef3be7687b4a13bf23199fe9c01767e9b98bc
+1dd0692a163379d160e23ac52509d909b41b0a35
diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/.git_keep/index
index b010ceb11..f2656bed9 100644
Binary files a/test/integration/mergeConflicts/expected/.git_keep/index and b/test/integration/mergeConflicts/expected/.git_keep/index differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD
index 706d998e5..587c36a83 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD
+++ b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD
@@ -1,35 +1,34 @@
-0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 commit (initial): first commit
-495a8676a677db2fcd6963abc94685ab87f0f1e2 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 checkout: moving from master to feature/cherry-picking
-495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI <CI@example.com> 1617312234 +1100 commit: first commit freshman year
-78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI <CI@example.com> 1617312234 +1100 commit: second commit subway eat fresh
-9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI <CI@example.com> 1617312234 +1100 commit: third commit fresh
-9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI <CI@example.com> 1617312234 +1100 commit: fourth commit cool
-fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI <CI@example.com> 1617312234 +1100 commit: fifth commit nice
-47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI <CI@example.com> 1617312234 +1100 commit: sixth commit haha
-34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI <CI@example.com> 1617312234 +1100 commit: seventh commit yeah
-bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 commit: eighth commit woo
-7e28009fced47639d5a8b45ec229bcfcc265066a 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 checkout: moving from feature/cherry-picking to develop
-7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312234 +1100 commit: first commit on develop
-ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
-495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 commit: first commit on master
-4c6b27ac04033b33a0f84869ec015b6361f28f31 ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop
-ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 commit: second commit on develop
-c21e6aeba03d5176c28b213be71d3a02e4966c87 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
-4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 commit: second commit on master
-9a415e7414f26bbb93a9369576b6135e29bc7391 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop
-c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 commit: third commit on develop
-2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
-9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 commit: third commit on master
-43e480c08cf3864f85bef1d5698b91786926cb58 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 checkout: moving from master to develop
-2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on develop
-51c0794d2dfd4eb71cc06f5e894edd3931411057 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 checkout: moving from develop to master
-43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on master
-258864d877e7897048a0894cad34fad2a5a4c709 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 checkout: moving from master to base_branch
-258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 commit: file
-5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from base_branch to other_branch
-5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from other_branch to base_branch
-5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI <CI@example.com> 1617312235 +1100 commit: file changed
-c28b32178002cb0046454f34e77f3d86391e748d 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 checkout: moving from base_branch to other_branch
-5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI <CI@example.com> 1617312236 +1100 commit: asd
-e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI <CI@example.com> 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch
-669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI <CI@example.com> 1617312266 +1100 commit: asd
+0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 commit (initial): first commit
+c5507059e2aa65bc2dad65bd38b879079b69c48c c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 checkout: moving from master to feature/cherry-picking
+c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI <CI@example.com> 1617586185 +1000 commit: first commit freshman year
+54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI <CI@example.com> 1617586185 +1000 commit: second commit subway eat fresh
+5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI <CI@example.com> 1617586185 +1000 commit: third commit fresh
+a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI <CI@example.com> 1617586185 +1000 commit: fourth commit cool
+174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI <CI@example.com> 1617586185 +1000 commit: fifth commit nice
+eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI <CI@example.com> 1617586185 +1000 commit: sixth commit haha
+00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI <CI@example.com> 1617586185 +1000 commit: seventh commit yeah
+fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 commit: eighth commit woo
+f05cdc6bb7f98285583770bec5a8d307a7805bd6 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 checkout: moving from feature/cherry-picking to develop
+f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI <CI@example.com> 1617586185 +1000 commit: first commit on develop
+417a3f75c440e565dab9b5afa78747ef37446348 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 checkout: moving from develop to master
+c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI <CI@example.com> 1617586186 +1000 commit: first commit on master
+a2a2ee2fe3ad96c470a921fe71c1216d93188c9b 417a3f75c440e565dab9b5afa78747ef37446348 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to develop
+417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI <CI@example.com> 1617586186 +1000 commit: second commit on develop
+4e71d4ff127ae9e3d482239e16dc1d78e56feec0 a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI <CI@example.com> 1617586186 +1000 checkout: moving from develop to master
+a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI <CI@example.com> 1617586186 +1000 commit: second commit on master
+a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to develop
+4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI <CI@example.com> 1617586186 +1000 commit: third commit on develop
+fe1f8f70f67822120b40d9d704011aec6e17c3a7 a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI <CI@example.com> 1617586186 +1000 checkout: moving from develop to master
+a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI <CI@example.com> 1617586186 +1000 commit: third commit on master
+f2a15f45b921460e675a8849db39de008b2c03cb fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to develop
+fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI <CI@example.com> 1617586186 +1000 commit: fourth commit on develop
+91e16cacdb23b0b5515c6109ea301b0cb6367010 f2a15f45b921460e675a8849db39de008b2c03cb CI <CI@example.com> 1617586186 +1000 checkout: moving from develop to master
+f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 commit: fourth commit on master
+1b3e191104f74b8e4054e22e9ab3b9dcfe299743 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 checkout: moving from master to base_branch
+1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 commit: file
+8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 checkout: moving from base_branch to other_branch
+8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 checkout: moving from other_branch to base_branch
+8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI <CI@example.com> 1617586186 +1000 commit: file changed
+0539c9baf43fb1939d8f56695ceb08a86e8e1fae 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 checkout: moving from base_branch to other_branch
+8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI <CI@example.com> 1617586188 +1000 commit: asd
+1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI <CI@example.com> 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch
diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch
index 1a02889c9..d924ca3c2 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch
+++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch
@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 branch: Created from HEAD
-258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 commit: file
-5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI <CI@example.com> 1617312235 +1100 commit: file changed
+0000000000000000000000000000000000000000 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 branch: Created from HEAD
+1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 commit: file
+8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI <CI@example.com> 1617586186 +1000 commit: file changed
diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop
index 0f164a9c2..bb6a166b8 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop
+++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop
@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 branch: Created from HEAD
-7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI <CI@example.com> 1617312234 +1100 commit: first commit on develop
-ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI <CI@example.com> 1617312235 +1100 commit: second commit on develop
-c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI <CI@example.com> 1617312235 +1100 commit: third commit on develop
-2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on develop
+0000000000000000000000000000000000000000 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 branch: Created from HEAD
+f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI <CI@example.com> 1617586185 +1000 commit: first commit on develop
+417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI <CI@example.com> 1617586186 +1000 commit: second commit on develop
+4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI <CI@example.com> 1617586186 +1000 commit: third commit on develop
+fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI <CI@example.com> 1617586186 +1000 commit: fourth commit on develop
diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking
index 74cdfb0c9..fe42f6cc0 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking
+++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking
@@ -1,9 +1,9 @@
-0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 branch: Created from HEAD
-495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI <CI@example.com> 1617312234 +1100 commit: first commit freshman year
-78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI <CI@example.com> 1617312234 +1100 commit: second commit subway eat fresh
-9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI <CI@example.com> 1617312234 +1100 commit: third commit fresh
-9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI <CI@example.com> 1617312234 +1100 commit: fourth commit cool
-fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI <CI@example.com> 1617312234 +1100 commit: fifth commit nice
-47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI <CI@example.com> 1617312234 +1100 commit: sixth commit haha
-34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI <CI@example.com> 1617312234 +1100 commit: seventh commit yeah
-bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI <CI@example.com> 1617312234 +1100 commit: eighth commit woo
+0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 branch: Created from HEAD
+c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI <CI@example.com> 1617586185 +1000 commit: first commit freshman year
+54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI <CI@example.com> 1617586185 +1000 commit: second commit subway eat fresh
+5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI <CI@example.com> 1617586185 +1000 commit: third commit fresh
+a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI <CI@example.com> 1617586185 +1000 commit: fourth commit cool
+174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI <CI@example.com> 1617586185 +1000 commit: fifth commit nice
+eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI <CI@example.com> 1617586185 +1000 commit: sixth commit haha
+00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI <CI@example.com> 1617586185 +1000 commit: seventh commit yeah
+fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI <CI@example.com> 1617586185 +1000 commit: eighth commit woo
diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master
index 21cc73d8b..fb187ba0e 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master
+++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master
@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI <CI@example.com> 1617312234 +1100 commit (initial): first commit
-495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI <CI@example.com> 1617312235 +1100 commit: first commit on master
-4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI <CI@example.com> 1617312235 +1100 commit: second commit on master
-9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI <CI@example.com> 1617312235 +1100 commit: third commit on master
-43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI <CI@example.com> 1617312235 +1100 commit: fourth commit on master
+0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI <CI@example.com> 1617586185 +1000 commit (initial): first commit
+c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI <CI@example.com> 1617586186 +1000 commit: first commit on master
+a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI <CI@example.com> 1617586186 +1000 commit: second commit on master
+a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI <CI@example.com> 1617586186 +1000 commit: third commit on master
+f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI <CI@example.com> 1617586186 +1000 commit: fourth commit on master
diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch
index f3b0e8d6b..294c5fa02 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch
+++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch
@@ -1,4 +1,3 @@
-0000000000000000000000000000000000000000 5d7d612ecff0165ff92363cdf90acda30170038e CI <CI@example.com> 1617312235 +1100 branch: Created from HEAD
-5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI <CI@example.com> 1617312236 +1100 commit: asd
-e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI <CI@example.com> 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch
-669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI <CI@example.com> 1617312266 +1100 commit: asd
+0000000000000000000000000000000000000000 8e13f545446048648331cbe93de64b1cf22df166 CI <CI@example.com> 1617586186 +1000 branch: Created from HEAD
+8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI <CI@example.com> 1617586188 +1000 commit: asd
+1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI <CI@example.com> 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d b/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d
new file mode 100644
index 000000000..fc38886e8
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d
@@ -0,0 +1,3 @@
+x��M
+�0F]��d&��D��z�I:����F��-x� ����h`ѝڦ
+���\p1��.�R�Ó�Dbˤ�]�lV���@5q�co�+��+��3c`��c���|ڼl0�p ƻ�Rק^�Ro@��?��L�h��8��Oܼ {��g�,��/��=�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae b/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae
new file mode 100644
index 000000000..d42d27687
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae
@@ -0,0 +1,3 @@
+x��M
+� @�=��Bqt J)d�c�86��`��o����[<ޖe�R��CD7@��B�C� �n)K��m�PŪ= �v \���`$��I�
+an��D*�� z�}������o�CA� ���1F�����'Wm~��)�/��! <<
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480
new file mode 100644
index 000000000..15d9caba9
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480
@@ -0,0 +1,3 @@
+x��K
+� E;v� �O�'�R�(˸�C
+�1��W�::p9N���:W�\zK�G8��+� ���dݤ V��� � h��9&���&�GT �Lv�� �VV/� g�j������L �cO�P˃K+�!+��� ���O��z����m��� �m>�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743
new file mode 100644
index 000000000..dd70f37c5
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743
@@ -0,0 +1,3 @@
+x��A
+�0E]��d�M�D��z�I2��1%���-x����/�R �So"0�8i�$��u9zC1ӄ�D� �,)����M^ ��d�6��-�� ;�}
+�O���q�A����`^�:/w�pٞr���ป���,� �A��.�U�{�+�4�/(�>l�&�A/
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 b/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35
new file mode 100644
index 000000000..5e5e92605
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 b/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709
deleted file mode 100644
index 34d3b62c9..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709
+++ /dev/null
@@ -1,2 +0,0 @@
-x��M
-�0F]��$��t"�� #��P��R#x| ^���{|�[���C�D�y =F�I9d��f���rQ��³Y�&�މ'˖X E��(�!&* G�i�\���K��6��6]�����z��nt8 .��Z��=�˟s����~�'���m�n@�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e b/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e
deleted file mode 100644
index 88a521a36..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b b/test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b
new file mode 100644
index 000000000..1bb1267c7
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 b/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90
deleted file mode 100644
index d77ebe3af..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 b/test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348
new file mode 100644
index 000000000..27325b2ab
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 b/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58
deleted file mode 100644
index 0a877f7d8..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58
+++ /dev/null
@@ -1,2 +0,0 @@
-x��K
-�0@]��$��o@D�ǘ�SZ0�� ߂p�xްֺ4p�OmW�)˔�%� c�1y�� }��gR/��d�g�A�G?�XJa��!���:.C"F#�6�;t=\��� ��C/�Zo��s��h�9�1��Oݴy�G�U�>����f(>X
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e b/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e
deleted file mode 100644
index dfe80867a..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 b/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2
deleted file mode 100644
index ae02634d4..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 b/test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680
similarity index 74%
rename from test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051
rename to test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680
index a5cc1d5b4..923f56302 100644
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 and b/test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 b/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31
deleted file mode 100644
index 6db47e52d..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31
+++ /dev/null
@@ -1,2 +0,0 @@
-x��K
-1D]��d�O��0�9F'��c�L�o� ��W��TK�:� O�1�͚���#�*O-�����Q���Z����� �w�_��iu�4ń�K1�1!Y z�Gm0/p��;��O��Zn ��Z*�-���&1�q��u��vt�YP_P����A?@
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0
new file mode 100644
index 000000000..f637207dd
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4
deleted file mode 100644
index a8cba65d0..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4
+++ /dev/null
@@ -1,2 +0,0 @@
-x��M
-1 @a�=E��$�IS\�1:m��u����w����-^Yz �����B��b�1�f�� sc��kn"!Vq��5o�����IZP�ɣR�k�l=�����ɟq_6�Mp�MW��>�T�~b���e�#���>5�On� \�7�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 b/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057
deleted file mode 100644
index 1011da458..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057
+++ /dev/null
@@ -1,3 +0,0 @@
-x��A
-� E���/�hT(��U�1�H
-�1��oJ/���� �XKytP��ޘ����yH�2\�چ�v�=*ic �ب��F�2�w�(��;R�>[�&$C$CV,h�Km0�p��;��l+_b-7��J
ΈR�� �:���\���eP����k��کB9
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 b/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833
new file mode 100644
index 000000000..ebdcf28a2
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833
@@ -0,0 +1,3 @@
+x��A
+� ��� EM4
+���1��' �& ����z0�b ��,MݝZ�3�`���R��C�@�9��A�ȋ�*�M��jP6�9�$JǦ�G?5�����ڼV9N�:Nw��l\x-7�� �w�[y�J)q�#��O]��G��J���BO�U�̙C�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e
deleted file mode 100644
index 7a2dae55f..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731
new file mode 100644
index 000000000..9633a4077
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec b/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec
new file mode 100644
index 000000000..1b6dcc55d
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 b/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039
deleted file mode 100644
index 3d485ea3a..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf b/test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf
deleted file mode 100644
index 69607a60e..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 b/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8
deleted file mode 100644
index 48a86e556..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a b/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a
deleted file mode 100644
index aa7368f74..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 b/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62
deleted file mode 100644
index 099aa4250..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 b/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166
new file mode 100644
index 000000000..1ed4cdd2a
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166
@@ -0,0 +1,2 @@
+x��K
+�0]�� �'���� #�/Xhl)<�9��a&ﭭ]*V�~RS�9�B1آ�e��tL �s�=��8��ӄ+2՛`�h
�iJ\r�f�f��_�)�E���oldž[��C*��
N'���Ġc��O]�u��:U9P
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221
deleted file mode 100644
index 552afabd3..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221
+++ /dev/null
@@ -1,3 +0,0 @@
-x��M
-�0F]��$�i@D���L&�`l�<�/���G{�[-ݩ7f�S
-�d��V�F��Q������Do1[q�������!)%3&��R SQ(MI֕���^�w_���y��'�����
�W�(����b���Ϲ���2�,(�_��t�@
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010
new file mode 100644
index 000000000..979a5d3db
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010
@@ -0,0 +1,2 @@
+x��M
+�0F]��d&��D��z��L�ИR������_��<;h�So" �ɐ \ʆC��8G��1Im�ɫC�.3f�N��iL���D+�q��ޗ�`��6�����r��܁,��Yr΄��X�S]��U�{� �2�/H�n� f�Ac
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 b/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391
deleted file mode 100644
index 1c96a4134..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391
+++ /dev/null
@@ -1,4 +0,0 @@
-x��A
-1 E]�� �4����0�9F3(ة�<�^���_[���p�W3��K*���d���"�rئ/3됆�{�ՖA���2�s
-I��HC�}��\~�[[a��4N���|�A[= E&�y�=���v�۟�{���
-� �5���}2�?o
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 b/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6
deleted file mode 100644
index 288d56942..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b
new file mode 100644
index 000000000..1db4d9945
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b
@@ -0,0 +1,4 @@
+x��K
+1D]�� ��AD�� �'��c�L�o� �*(���TKٺ4
+O�1K�-;���@�MV=9@��2F��&0ي���Lޫ�<�!
+~If�u�ja��*�09H���Q��fy��;��O��ZnR =
A��RJ�vHu�s.�֎��R_��1`���?U
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a4/2af37388a9ad2eac85f71828cfc63262c90900 b/test/integration/mergeConflicts/expected/.git_keep/objects/a4/2af37388a9ad2eac85f71828cfc63262c90900
new file mode 100644
index 000000000..21a0225ca
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a4/2af37388a9ad2eac85f71828cfc63262c90900
@@ -0,0 +1,3 @@
+x��K
+�0@]��d�@D�ǘL��`l�<�/��� <�j];ht��D�D
+�0e���^�����x��$os�j�&�N ��56�4��)Q�&zN3:�"��ݗ��8�u���?��[����� �����T�?u��U07y-� [�@
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d b/test/integration/mergeConflicts/expected/.git_keep/objects/a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d
new file mode 100644
index 000000000..ab31e5a5e
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d
@@ -0,0 +1,2 @@
+x��A
+�0E]��$���D��z��t��iJ���.��?����C{��*�(I��G/��0xJ>Q�ܷ������l��Z� ;U�h�s$���pQ��i� � 1~�G�a��:Nw�p�^z��o��~m����Z�h;U�Ϻ9T�:�O��B��� �?@]
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa b/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa
deleted file mode 100644
index 3cf1dac98..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa
+++ /dev/null
@@ -1,3 +0,0 @@
-x��K
-�0@]��d&_"BW=�$�P��R���-x����幵k�~�W(��} �ٹ�V"U.: 93R�Rb4j�U� �5�%o,{�s�5�\��� �E'��\#*~�i^a�4�ys[nr�s;y
-��6�D�j��T�?u����2����𤾸�>�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87
deleted file mode 100644
index 518fc5977..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d
deleted file mode 100644
index 161eb926a..000000000
--- a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d
+++ /dev/null
@@ -1,2 +0,0 @@
-x��K
-�0�a�9����5
�]��d�����#���?o�27��/�Ő��ƎQ�X�e�EF Q�GLU���!k�X�&tªST��'�U�-\��H��NL��i;� ��O��eˍ����<:�#\�5g=���ɍ�o����j~�<�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c b/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c
new file mode 100644
index 000000000..4737ac8dd
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 b/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98
deleted file mode 100644
index dfd30d889..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc b/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc
deleted file mode 100644
index e8895a84c..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 b/test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8
new file mode 100644
index 000000000..60935a1f4
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 b/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6
new file mode 100644
index 000000000..66eeb34ae
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6
@@ -0,0 +1,2 @@
+x��M
+�0F]��$��I"BW=F�Ll��R"z|+^@�V���K�֥����7fp^Qf�4)������\�� �'k�7~t(SV9��Ii�
��&�$��T�%R(V�g����a��;������YO�- QJ)v�����.x��}�_����Q=�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb b/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb
new file mode 100644
index 000000000..53e60ec34
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb
@@ -0,0 +1,3 @@
+x��K
+�0@]��$�N& "���̄�-5�Ƿ��>ރW�����C�T��D\�`C�89���<j�H�#�\�ʛ>;0��<�ԎY���H
+I�$#A_���>-��p�ݯ��>�T�v�.
����Zkv�Ou�S7}�7�_����|A�@
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 b/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5
new file mode 100644
index 000000000..73675419e
--- /dev/null
+++ b/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5
@@ -0,0 +1,2 @@
+x��K
+�0@]��d�O@D�ǘdF*X[j��/��� ������k�0�DcBԾ���d}!6%Q%ԅ�s�j�M�
�_�]�RB��`H�63:rl�I��٦e�a��0��M�z�C]�蠣OA'{����>��O]=��_&�u���~�>�
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea b/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea
deleted file mode 100644
index 422081a4d..000000000
Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea and /dev/null differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 b/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7
new file mode 100644
index 000000000..d1205a6da
Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 differ
diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch
index 0babb4c93..bc3596fef 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch
+++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch
@@ -1 +1 @@
-c28b32178002cb0046454f34e77f3d86391e748d
+0539c9baf43fb1939d8f56695ceb08a86e8e1fae
diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop
index 88a6f88c5..f2eaf134c 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop
+++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop
@@ -1 +1 @@
-51c0794d2dfd4eb71cc06f5e894edd3931411057
+91e16cacdb23b0b5515c6109ea301b0cb6367010
diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking
index d42443ba1..c65182816 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking
+++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking
@@ -1 +1 @@
-7e28009fced47639d5a8b45ec229bcfcc265066a
+f05cdc6bb7f98285583770bec5a8d307a7805bd6
diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master
index 998aceb22..1b286a9b0 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master
+++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master
@@ -1 +1 @@
-258864d877e7897048a0894cad34fad2a5a4c709
+1b3e191104f74b8e4054e22e9ab3b9dcfe299743
diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch
index 3c950a997..085978d43 100644
--- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch
+++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch
@@ -1 +1 @@
-4ea473079cfdf1776e0d7dc114501860b8ab40c4
+32129537d40d9fb35cf3dd6fba7985870142324b
diff --git a/test/integration/mergeConflicts/expected/directory/file b/test/integration/mergeConflicts/expected/directory/file
index 180cf8328..df6b0d2bc 100644
--- a/test/integration/mergeConflicts/expected/directory/file
+++ b/test/integration/mergeConflicts/expected/directory/file
@@ -1 +1 @@
-test2
+test3
diff --git a/test/integration/mergeConflicts/expected/directory/file2 b/test/integration/mergeConflicts/expected/directory/file2
index 180cf8328..df6b0d2bc 100644
--- a/test/integration/mergeConflicts/expected/directory/file2
+++ b/test/integration/mergeConflicts/expected/directory/file2
@@ -1 +1 @@
-test2
+test3
diff --git a/test/integration/mergeConflicts/expected/file1 b/test/integration/mergeConflicts/expected/file1
index dcd348507..5d874a902 100644
--- a/test/integration/mergeConflicts/expected/file1
+++ b/test/integration/mergeConflicts/expected/file1
@@ -60,4 +60,4 @@ once upon a time there was a cat
...
...
...
-once upon a time there was another cat
+once upon a time there was another dog
diff --git a/test/integration/mergeConflicts/expected/file3 b/test/integration/mergeConflicts/expected/file3
index 1b9ae5f5d..e3ae5c6d8 100644
--- a/test/integration/mergeConflicts/expected/file3
+++ b/test/integration/mergeConflicts/expected/file3
@@ -1 +1 @@
-once upon a time there was a mouse
+once upon a time there was a horse
diff --git a/test/integration/mergeConflicts/expected/file4 b/test/integration/mergeConflicts/expected/file4
index e3ae5c6d8..1b9ae5f5d 100644
--- a/test/integration/mergeConflicts/expected/file4
+++ b/test/integration/mergeConflicts/expected/file4
@@ -1 +1 @@
-once upon a time there was a horse
+once upon a time there was a mouse
diff --git a/test/integration/mergeConflicts/expected/file5 b/test/integration/mergeConflicts/expected/file5
index 8603b3753..1b9ae5f5d 100644
--- a/test/integration/mergeConflicts/expected/file5
+++ b/test/integration/mergeConflicts/expected/file5
@@ -1,2 +1 @@
-once upon a time there was a horse
once upon a time there was a mouse
diff --git a/test/integration/mergeConflicts/recording.json b/test/integration/mergeConflicts/recording.json
index a1538ecc8..52b825301 100644
--- a/test/integration/mergeConflicts/recording.json
+++ b/test/integration/mergeConflicts/recording.json
@@ -1 +1 @@
-[{"Timestamp":12,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":457,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":577,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":744,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":872,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":937,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1049,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1442,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1704,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":1832,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":1936,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2425,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":77,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"TQ=="}},{"Timestamp":2697,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3272,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3634,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":4177,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":4696,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":4985,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":5777,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5905,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":6113,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":6937,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":7353,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":7577,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":8737,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":96,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YA=="}},{"Timestamp":9409,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9743,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9759,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9775,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9792,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9809,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9826,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9844,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9859,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9877,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9894,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9910,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9928,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9944,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9960,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9977,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":9995,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10010,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10027,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10044,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10061,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10077,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10094,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10111,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10127,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10144,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10161,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10178,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10195,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":10345,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":10817,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":11240,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":12230,"Event":{"Type":0,"Mod":0,"Key":27,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Gw=="}},{"Timestamp":12497,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":13808,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":14145,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":14505,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":14760,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":15369,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":15970,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":16233,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":16825,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17159,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17175,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17191,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17208,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17224,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17240,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17257,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17274,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17290,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":17307,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":18073,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18689,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":19337,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":19841,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":20725,"Event":{"Type":0,"Mod":0,"Key":27,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Gw=="}},{"Timestamp":20977,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":96,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YA=="}},{"Timestamp":21545,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":21904,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":22377,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":22705,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":23625,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":24057,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":24345,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":24601,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":25121,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":26113,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":98,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yg=="}},{"Timestamp":27209,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":28761,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":29905,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":30137,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":30177,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":30225,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":30465,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":30657,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":30680,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":30721,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":30849,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":31601,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":113,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cQ=="}}]
\ No newline at end of file
+{"KeyEvents":[{"Timestamp":1126,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1332,"Mod":0,"Key":256,"Ch":99},{"Timestamp":1621,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1677,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1758,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1990,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2286,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2557,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2805,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2957,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3541,"Mod":0,"Key":256,"Ch":77},{"Timestamp":3869,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4437,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4773,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4917,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5053,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5269,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5773,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6317,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6549,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6829,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7501,"Mod":0,"Key":256,"Ch":96},{"Timestamp":8429,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9349,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10197,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10530,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10546,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10563,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10579,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10595,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10611,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10628,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10645,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10662,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10678,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10694,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10711,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10728,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10745,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10761,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10777,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10794,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10810,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10827,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10844,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10860,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10877,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10895,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10911,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10927,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10943,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10960,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10977,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10993,"Mod":0,"Key":257,"Ch":0},{"Timestamp":12005,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12349,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12909,"Mod":0,"Key":257,"Ch":0},{"Timestamp":13276,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14301,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14836,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15597,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15930,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15946,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15962,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15978,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15995,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16011,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16028,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16044,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16060,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16076,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16093,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16109,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16126,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16143,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16160,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16177,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16194,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16210,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16573,"Mod":0,"Key":257,"Ch":0},{"Timestamp":16741,"Mod":0,"Key":257,"Ch":0},{"Timestamp":17053,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17565,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18109,"Mod":0,"Key":258,"Ch":0},{"Timestamp":18357,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19157,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20012,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]}
\ No newline at end of file
diff --git a/test/integration/mergeConflicts/test.json b/test/integration/mergeConflicts/test.json
index fae2b759a..1082379ed 100644
--- a/test/integration/mergeConflicts/test.json
+++ b/test/integration/mergeConflicts/test.json
@@ -1 +1 @@
-{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 8 }
+{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 10 }