diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG
index 976d36736..d72af3146 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG
@@ -1,35 +1 @@
-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/mergeConflictUndo/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: directory/file
-# modified: file1
-#
+asd
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_HEAD
new file mode 100644
index 000000000..3aaf94808
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_HEAD
@@ -0,0 +1 @@
+8f9f24614460289546a49cb6f12a72b764af14f5
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MODE b/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MODE
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MSG b/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MSG
new file mode 100644
index 000000000..33462aeb1
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MSG
@@ -0,0 +1,9 @@
+Merge branch 'develop' into other_branch
+
+# Conflicts:
+# directory/file
+# directory/file2
+# file1
+# file3
+# file4
+# file5
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD
index c39f90780..582e1c389 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD
@@ -1 +1 @@
-ab172f11e9d1ffc28e53b7c5504f173bf1b27527
+c622516f02266679505b89103007ec04b8748b67
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/index b/test/integration/mergeConflictUndo/expected/.git_keep/index
index 680aeaeee..7db057af5 100644
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/index and b/test/integration/mergeConflictUndo/expected/.git_keep/index differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD
index c185b357c..d6504a61b 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD
@@ -1,34 +1,33 @@
-0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 commit (initial): first commit
-db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 checkout: moving from master to feature/cherry-picking
-db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI <CI@example.com> 1617319581 +1100 commit: first commit freshman year
-1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI <CI@example.com> 1617319581 +1100 commit: second commit subway eat fresh
-58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI <CI@example.com> 1617319581 +1100 commit: third commit fresh
-289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI <CI@example.com> 1617319581 +1100 commit: fourth commit cool
-36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI <CI@example.com> 1617319581 +1100 commit: fifth commit nice
-7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI <CI@example.com> 1617319581 +1100 commit: sixth commit haha
-8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI <CI@example.com> 1617319581 +1100 commit: seventh commit yeah
-2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 commit: eighth commit woo
-7d80e0ed109e6802aa1f23a473200c9af3f8cf61 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 checkout: moving from feature/cherry-picking to develop
-7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI <CI@example.com> 1617319581 +1100 commit: first commit on develop
-e503834faae098b6e456c2e2ab921737b3fd957c db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
-db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI <CI@example.com> 1617319581 +1100 commit: first commit on master
-cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 e503834faae098b6e456c2e2ab921737b3fd957c CI <CI@example.com> 1617319581 +1100 checkout: moving from master to develop
-e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI <CI@example.com> 1617319581 +1100 commit: second commit on develop
-9e0b31da5b56c4dd7230a85fee330246c16845ac cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
-cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI <CI@example.com> 1617319581 +1100 commit: second commit on master
-af2cd230f86b71f1b77a2b13fd090d88f13575e9 9e0b31da5b56c4dd7230a85fee330246c16845ac CI <CI@example.com> 1617319581 +1100 checkout: moving from master to develop
-9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI <CI@example.com> 1617319581 +1100 commit: third commit on develop
-084111cdf3945cf795dfa651723e7e6a927e48ef af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
-af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI <CI@example.com> 1617319581 +1100 commit: third commit on master
-627a99630df8cc12c4acdebac3e3e8af1adf9711 084111cdf3945cf795dfa651723e7e6a927e48ef CI <CI@example.com> 1617319581 +1100 checkout: moving from master to develop
-084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on develop
-8b7aa507318e42a4efdae2c867d89590bbce48e5 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI <CI@example.com> 1617319581 +1100 checkout: moving from develop to master
-627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on master
-5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 checkout: moving from master to base_branch
-5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 commit: file
-7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 checkout: moving from base_branch to other_branch
-7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 checkout: moving from other_branch to base_branch
-7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI <CI@example.com> 1617319581 +1100 commit: file changed
-c4b40606be30048d61ed9bb55e21ecd612f34d7d 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 checkout: moving from base_branch to other_branch
-7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI <CI@example.com> 1617319582 +1100 commit: asd
-ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI <CI@example.com> 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch
+0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 commit (initial): first commit
+bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to feature/cherry-picking
+bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI <CI@example.com> 1617585236 +1000 commit: first commit freshman year
+bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI <CI@example.com> 1617585236 +1000 commit: second commit subway eat fresh
+39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI <CI@example.com> 1617585236 +1000 commit: third commit fresh
+e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI <CI@example.com> 1617585236 +1000 commit: fourth commit cool
+61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI <CI@example.com> 1617585236 +1000 commit: fifth commit nice
+06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI <CI@example.com> 1617585236 +1000 commit: sixth commit haha
+2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI <CI@example.com> 1617585236 +1000 commit: seventh commit yeah
+97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 commit: eighth commit woo
+05a37c1f6dc7942f15f80d45254d38735918f670 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 checkout: moving from feature/cherry-picking to develop
+05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI <CI@example.com> 1617585236 +1000 commit: first commit on develop
+b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
+bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI <CI@example.com> 1617585236 +1000 commit: first commit on master
+ab79b4d60771766afa792d180d79f39d60739285 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to develop
+b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI <CI@example.com> 1617585236 +1000 commit: second commit on develop
+54b6871251edf1636a77993925843c6294daa768 ab79b4d60771766afa792d180d79f39d60739285 CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
+ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI <CI@example.com> 1617585236 +1000 commit: second commit on master
+ea69b78c08d9698cadc90164ddd19aca6ae05d5f 54b6871251edf1636a77993925843c6294daa768 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to develop
+54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI <CI@example.com> 1617585236 +1000 commit: third commit on develop
+aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
+ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI <CI@example.com> 1617585236 +1000 commit: third commit on master
+8ceeb6cc4581b42aa9deaf9710223615ee17bef2 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to develop
+aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on develop
+8f9f24614460289546a49cb6f12a72b764af14f5 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI <CI@example.com> 1617585236 +1000 checkout: moving from develop to master
+8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on master
+9c09cc9177a699a0a920d8c2a84cd2de68295382 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 checkout: moving from master to base_branch
+9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 commit: file
+9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 checkout: moving from base_branch to other_branch
+9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 checkout: moving from other_branch to base_branch
+9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI <CI@example.com> 1617585236 +1000 commit: file changed
+010057d2acf80e41ed5e6a8e49cb2c8329ae843b 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 checkout: moving from base_branch to other_branch
+9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI <CI@example.com> 1617585237 +1000 commit: asd
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch
index 64af6934b..b52cadf2c 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch
@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
-5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 commit: file
-7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI <CI@example.com> 1617319581 +1100 commit: file changed
+0000000000000000000000000000000000000000 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
+9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 commit: file
+9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI <CI@example.com> 1617585236 +1000 commit: file changed
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop
index abb04bbd5..38023c845 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop
@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
-7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI <CI@example.com> 1617319581 +1100 commit: first commit on develop
-e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI <CI@example.com> 1617319581 +1100 commit: second commit on develop
-9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI <CI@example.com> 1617319581 +1100 commit: third commit on develop
-084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on develop
+0000000000000000000000000000000000000000 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
+05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI <CI@example.com> 1617585236 +1000 commit: first commit on develop
+b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI <CI@example.com> 1617585236 +1000 commit: second commit on develop
+54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI <CI@example.com> 1617585236 +1000 commit: third commit on develop
+aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on develop
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking
index 2b11e74e4..a08be0a14 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking
@@ -1,9 +1,9 @@
-0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
-db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI <CI@example.com> 1617319581 +1100 commit: first commit freshman year
-1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI <CI@example.com> 1617319581 +1100 commit: second commit subway eat fresh
-58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI <CI@example.com> 1617319581 +1100 commit: third commit fresh
-289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI <CI@example.com> 1617319581 +1100 commit: fourth commit cool
-36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI <CI@example.com> 1617319581 +1100 commit: fifth commit nice
-7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI <CI@example.com> 1617319581 +1100 commit: sixth commit haha
-8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI <CI@example.com> 1617319581 +1100 commit: seventh commit yeah
-2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI <CI@example.com> 1617319581 +1100 commit: eighth commit woo
+0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
+bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI <CI@example.com> 1617585236 +1000 commit: first commit freshman year
+bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI <CI@example.com> 1617585236 +1000 commit: second commit subway eat fresh
+39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI <CI@example.com> 1617585236 +1000 commit: third commit fresh
+e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI <CI@example.com> 1617585236 +1000 commit: fourth commit cool
+61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI <CI@example.com> 1617585236 +1000 commit: fifth commit nice
+06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI <CI@example.com> 1617585236 +1000 commit: sixth commit haha
+2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI <CI@example.com> 1617585236 +1000 commit: seventh commit yeah
+97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI <CI@example.com> 1617585236 +1000 commit: eighth commit woo
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master
index 5959f88c3..5cbf5c2a1 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master
@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI <CI@example.com> 1617319581 +1100 commit (initial): first commit
-db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI <CI@example.com> 1617319581 +1100 commit: first commit on master
-cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI <CI@example.com> 1617319581 +1100 commit: second commit on master
-af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI <CI@example.com> 1617319581 +1100 commit: third commit on master
-627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI <CI@example.com> 1617319581 +1100 commit: fourth commit on master
+0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI <CI@example.com> 1617585236 +1000 commit (initial): first commit
+bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI <CI@example.com> 1617585236 +1000 commit: first commit on master
+ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI <CI@example.com> 1617585236 +1000 commit: second commit on master
+ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI <CI@example.com> 1617585236 +1000 commit: third commit on master
+8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI <CI@example.com> 1617585236 +1000 commit: fourth commit on master
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch
index 1258a9d63..83227bd5e 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch
@@ -1,3 +1,2 @@
-0000000000000000000000000000000000000000 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI <CI@example.com> 1617319581 +1100 branch: Created from HEAD
-7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI <CI@example.com> 1617319582 +1100 commit: asd
-ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI <CI@example.com> 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch
+0000000000000000000000000000000000000000 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI <CI@example.com> 1617585236 +1000 branch: Created from HEAD
+9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI <CI@example.com> 1617585237 +1000 commit: asd
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b b/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b
new file mode 100644
index 000000000..0428f9615
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670
new file mode 100644
index 000000000..23901804e
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670
@@ -0,0 +1,2 @@
+x��M
+�0F]��$�d& �]���Z��R"z| ^�����+mY� �v��������Tr6&E��ф�3���2b(�Ԛ6yv��s4=cNKe�)V�L.��j��Tz��m0�p ƫ|Ҳ>�T�rd��X�#j��N�S]�ԕ�os����5�|�<�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23
new file mode 100644
index 000000000..8cbbd91b8
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23
@@ -0,0 +1,2 @@
+x��K
+�0@]��d�I�)�]��dB �C���-x�����mY��� �@���4���ze�G̝-Z�$F�����r�ڀm
�b�=�x+HH�19/)j(��%y�i;`�>�O�Ȳ������mbp�p��hNzN5�S7u�m�_��|��>�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef
deleted file mode 100644
index 4f28207f2..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef
+++ /dev/null
@@ -1,3 +0,0 @@
-x��M
-�0F]��d��k@D�ǘ$SZh��x| ^���{�/�m[t��VE ؐ=f��i
->�� �h&��`H��*{� 5e�Ѻdr��F��$�5v�%r�����\* #܇�) ގUn�l w6(؞�J����<��O\�y�~� ��e-��x�@
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a b/test/integration/mergeConflictUndo/expected/.git_keep/objects/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a
deleted file mode 100644
index c7eb67d16..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/0a/71a0176c3eb0a7ccba7e8e675743aecb362f3a and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905
deleted file mode 100644
index 7a43582ea..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/1e/953a069f4b657c300ea0464ecc13f9c2e34905
+++ /dev/null
@@ -1,2 +0,0 @@
-x���
-�0E]�+f/H&�ւ�ટ1��P��#��[���:�7-��9��VrH H���g�A=ĥ��fH9�U* �&�qb��Tc�A}�@�]�1 �Z�F^m^*]G:]� �R�;i)g�{�C<2홭5�N5���|��F��r�s.���/�C�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/28/9b2994fdad04740a383797513c39dd183c87d3 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/28/9b2994fdad04740a383797513c39dd183c87d3
deleted file mode 100644
index 6db3cf7ce..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/28/9b2994fdad04740a383797513c39dd183c87d3
+++ /dev/null
@@ -1,3 +0,0 @@
-x��K
-1D]��$����0�9F��2�q����R��գh����h�M8�H^3��L1%�#1 I0��\a������'�(#�G��g�xr�m�F,Y���[�y��\����m�0Z��
-��Z�юS]��U_�᷂[�ת��O>�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd
deleted file mode 100644
index fe5c7b62d..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2f/15f547118f3c3d9c81175825923e13ec6f0aa0 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2f/15f547118f3c3d9c81175825923e13ec6f0aa0
new file mode 100644
index 000000000..eb79b2a8d
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2f/15f547118f3c3d9c81175825923e13ec6f0aa0
@@ -0,0 +1,2 @@
+x��K
+1D]��$����0�9F'��8�a�o� ��E�WPim��AIs�;3$��3ޑ!�K)�� *�T@���
b��_ �+<�%?@A 9Ys�zJSr1e�YiA�^� ���r����KZ�
С��*���RJ1�q��x?�^᷂J��JQ>`
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e b/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e
deleted file mode 100644
index abe3e24cc..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7
new file mode 100644
index 000000000..4696cdc84
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7 differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/50/573100e1dd69a2a1434e9e63b424946679925e b/test/integration/mergeConflictUndo/expected/.git_keep/objects/50/573100e1dd69a2a1434e9e63b424946679925e
deleted file mode 100644
index b17398837..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/50/573100e1dd69a2a1434e9e63b424946679925e and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/54/b6871251edf1636a77993925843c6294daa768 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/54/b6871251edf1636a77993925843c6294daa768
new file mode 100644
index 000000000..6a70a1566
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/54/b6871251edf1636a77993925843c6294daa768 differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9
deleted file mode 100644
index a1747ab35..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/58/151e1e14571021b5d38d941538a2e3c3d0e7a9 and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401
deleted file mode 100644
index 706da50c3..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5e/9fe3aa0c84eab154f6f8796804b9e2e0ab0401
+++ /dev/null
@@ -1,2 +0,0 @@
-x��A
-�0E]��$ӴM"BW=�t2CcJL��[�n �� ��
:��VE���{ QD��〬�-YD�@�JJ '�Q�W�����l��� ��Ib'N)R��
�m-���|���).�ǝw��pF�� �j���h�k[�AyA��a�/��BC
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/61/f5538c896ea41a0303368b24ab8e5dd6b0fba3 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/61/f5538c896ea41a0303368b24ab8e5dd6b0fba3
new file mode 100644
index 000000000..ec4d09afc
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/61/f5538c896ea41a0303368b24ab8e5dd6b0fba3 differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/62/7a99630df8cc12c4acdebac3e3e8af1adf9711 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/62/7a99630df8cc12c4acdebac3e3e8af1adf9711
deleted file mode 100644
index d6d13679f..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/62/7a99630df8cc12c4acdebac3e3e8af1adf9711
+++ /dev/null
@@ -1,2 +0,0 @@
-x��K
-�0@]��$��D��z�i3�cJ���-x����ֵͭ����w0�K��&K!x"��tH��쨰#+���x�g.f���Ba�Xp��̈́�d�t&*h}�����vF��]>\��\�Vo���� ጨ�:�1��O]�e�3�*hO��:b�Ϫ?
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a b/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a
deleted file mode 100644
index 19670ff5a..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61
deleted file mode 100644
index 7b77d9102..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57
deleted file mode 100644
index e8b43881c..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57
+++ /dev/null
@@ -1,3 +0,0 @@
-x��A
-� ��� ů�k��BV9��>I�&!X���� f`d�ui�i� à8tV��> �Q�4�a�mNQԞ�����D�����RH
-r�]� ��m�=��>�O|R�_��V ��������Dƨ��S
�,���W�u�/ҁ?
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f
deleted file mode 100644
index 1ff6e120f..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f
+++ /dev/null
@@ -1,2 +0,0 @@
-x��M
-�0@a�9E��̴���� c�L���R"x|{��o�����-2^��j ��e��=�+i��TCH AJ�f�C��z媣dr* ���R�@�� ��Om��f{��~������ ���+"�9�9��On겪�p�9�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4
deleted file mode 100644
index 7457a235e..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4
+++ /dev/null
@@ -1,3 +0,0 @@
-x��K
-�@D]�)z/Hz~�!� �'�acB !�w� ���գ�uY l�OuW� �}�ŋ��3�� �
-![Fv)��d�W�}��v&$�9���]B�>$��Y�Բ�0�p ƻ �lO�L�r�H��gĮ3�m�������~+(R�|��<�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5
deleted file mode 100644
index 068186500..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5 and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2
new file mode 100644
index 000000000..445a71f0c
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2
@@ -0,0 +1,3 @@
+x��M
+�0F]��d��g"BW=ƘLi�4%F������_,9o
�VE`Оx��0�s�HkoЅ��dhaC�^��U�� y�H)�@�S ��I)��� �d�ﶖ
+� �i�ˇ��K,��io����FD��~�ɟ�j�V�*(;d~�X}1�?�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5
new file mode 100644
index 000000000..59111e4e2
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5
@@ -0,0 +1,2 @@
+x��A
+�0��)��P�11J)��?� Ԉ���W�� f`bY�W%�|�;@1>F�� |�ƅ���{֍��Mj� k%�� ������f�-��w���M�<+9�TvF�� Y��X�q��z�ێ��4�:�9U�r9�:�/��R�s��31B�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f
new file mode 100644
index 000000000..68717092a
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382
new file mode 100644
index 000000000..8bd499914
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382
@@ -0,0 +1,3 @@
+x��M
+�0F]��$�6?�� c2�P��RS����ۏ�x �R
�S�E`ُ�P$O.d�,rF�I#f
+��9��vy5, �h��MI(O �1�C+�>J6���� ���r���)��=�m���3j�U_��&�*�co+�4�/(����fA�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac
deleted file mode 100644
index b83a45469..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907
new file mode 100644
index 000000000..07c4733e6
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527
deleted file mode 100644
index d98609f9c..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285
new file mode 100644
index 000000000..84d67dadd
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285
@@ -0,0 +1,5 @@
+x��M
+�0�a�9���3 "t�cL� �)i�o� ��x �R-e�%�zc�
[�!ZO�t� ـa��qBcM
+:�S�W�Q+�|$��O��q���ęx�� z�Gm0/p��;��O��Zn���\p�x8+)��8���\� ~
+�
+ �/��@�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681
new file mode 100644
index 000000000..781dfa0c9
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681
@@ -0,0 +1,3 @@
+x��K
+�@ @]�)�$�_���L��uJ��+x������,��p�73�$���*��Yx"�SD
S�
+C)n�� R����Y�)���"A|b(�K�����~m�8����uY�v(m9e�4$ 2� ݗ~�����~�m~�T{ٽ����?
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9
deleted file mode 100644
index 3db36405e..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9 and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4
new file mode 100644
index 000000000..ae401c393
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6
new file mode 100644
index 000000000..2480055e3
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427
new file mode 100644
index 000000000..6425bd3e4
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427
@@ -0,0 +1,3 @@
+x��K
+1]��$���aVs���
+ƑAo���UP��z��]����*���?��P|��W�(\���sí���wQ�%Mc� 0Hf�ɂQ{HB4���Ѽ�a^Nxq�_�ӵ �E� ��C���֚/�Nu���ri�N��J��\�Fop3 ��D�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d
deleted file mode 100644
index 2552eac78..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67
new file mode 100644
index 000000000..850d9678d
Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67 differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50
deleted file mode 100644
index a28c77ab8..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015
deleted file mode 100644
index a634f2a57..000000000
Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 and /dev/null differ
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270
new file mode 100644
index 000000000..6fc26c12d
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270
@@ -0,0 +1,2 @@
+x��K
+�0@]��d��$�� #�Lh��#x| ^���=x����A�;�&%$� �lu֙�8�� i,&��Ū=5yv01��r�!�C4X�R�d�2V�s4Q�J�>o
� ��t�OZ��\x[o0��]p��DT=�����>/������5�/�?
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c
deleted file mode 100644
index f2a0385c5..000000000
--- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c
+++ /dev/null
@@ -1,2 +0,0 @@
-x��K
-�0@]��d&�_AD�Lj� �)1�Ƿ��>ރ��� 4�7��o� �1��$���#���rq&��&�>�L8� �c��9�1
�p �8R����8�y�����)����3
6 ��N��.�����WA}@��,uS_6�?�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f
new file mode 100644
index 000000000..b9fd215e0
--- /dev/null
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f
@@ -0,0 +1,2 @@
+x��M
+�0�]��d��3 �]y��OQ0Mi#x|#^���� /�R
��C�r�1d�5G$!�� ]�0�8�1�U��4��> ��;A$��7I;L�g뿁�ƍJ^�^7�np�n����>�)�rM����G�����T��՞c]�0� �;�>;�?�
\ No newline at end of file
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch
index a0b7c7bb1..1be09a6b2 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch
@@ -1 +1 @@
-c4b40606be30048d61ed9bb55e21ecd612f34d7d
+010057d2acf80e41ed5e6a8e49cb2c8329ae843b
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop
index 400785e4e..3aaf94808 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop
@@ -1 +1 @@
-8b7aa507318e42a4efdae2c867d89590bbce48e5
+8f9f24614460289546a49cb6f12a72b764af14f5
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking
index dd50c1b77..f91b953a9 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking
@@ -1 +1 @@
-7d80e0ed109e6802aa1f23a473200c9af3f8cf61
+05a37c1f6dc7942f15f80d45254d38735918f670
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master
index 600f6b0ef..0b95f1f06 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master
@@ -1 +1 @@
-5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401
+9c09cc9177a699a0a920d8c2a84cd2de68295382
diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch
index ce5ef7aa4..582e1c389 100644
--- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch
+++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch
@@ -1 +1 @@
-0a71a0176c3eb0a7ccba7e8e675743aecb362f3a
+c622516f02266679505b89103007ec04b8748b67
diff --git a/test/integration/mergeConflictUndo/expected/directory/file b/test/integration/mergeConflictUndo/expected/directory/file
index 180cf8328..9165a12a9 100644
--- a/test/integration/mergeConflictUndo/expected/directory/file
+++ b/test/integration/mergeConflictUndo/expected/directory/file
@@ -1 +1,5 @@
+<<<<<<< HEAD
+test3
+=======
test2
+>>>>>>> develop
diff --git a/test/integration/mergeConflictUndo/expected/directory/file2 b/test/integration/mergeConflictUndo/expected/directory/file2
index df6b0d2bc..9165a12a9 100644
--- a/test/integration/mergeConflictUndo/expected/directory/file2
+++ b/test/integration/mergeConflictUndo/expected/directory/file2
@@ -1 +1,5 @@
+<<<<<<< HEAD
test3
+=======
+test2
+>>>>>>> develop
diff --git a/test/integration/mergeConflictUndo/expected/file3 b/test/integration/mergeConflictUndo/expected/file3
index e3ae5c6d8..32d15fd44 100644
--- a/test/integration/mergeConflictUndo/expected/file3
+++ b/test/integration/mergeConflictUndo/expected/file3
@@ -1 +1,5 @@
+<<<<<<< HEAD
once upon a time there was a horse
+=======
+once upon a time there was a mouse
+>>>>>>> develop
diff --git a/test/integration/mergeConflictUndo/expected/file4 b/test/integration/mergeConflictUndo/expected/file4
index e3ae5c6d8..32d15fd44 100644
--- a/test/integration/mergeConflictUndo/expected/file4
+++ b/test/integration/mergeConflictUndo/expected/file4
@@ -1 +1,5 @@
+<<<<<<< HEAD
once upon a time there was a horse
+=======
+once upon a time there was a mouse
+>>>>>>> develop
diff --git a/test/integration/mergeConflictUndo/expected/file5 b/test/integration/mergeConflictUndo/expected/file5
index e3ae5c6d8..32d15fd44 100644
--- a/test/integration/mergeConflictUndo/expected/file5
+++ b/test/integration/mergeConflictUndo/expected/file5
@@ -1 +1,5 @@
+<<<<<<< HEAD
once upon a time there was a horse
+=======
+once upon a time there was a mouse
+>>>>>>> develop
diff --git a/test/integration/mergeConflictUndo/recording.json b/test/integration/mergeConflictUndo/recording.json
index 59ef81733..efb7e9c14 100644
--- a/test/integration/mergeConflictUndo/recording.json
+++ b/test/integration/mergeConflictUndo/recording.json
@@ -1 +1 @@
-[{"Timestamp":28,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":468,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":675,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":764,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":820,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":877,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1084,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1470,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1613,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1805,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2101,"Event":{"Type":0,"Mod":0,"Key":65515,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09E"}},{"Timestamp":2268,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2389,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2548,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":3316,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":77,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"TQ=="}},{"Timestamp":3700,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4444,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5284,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5613,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5900,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":6684,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":6924,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":7148,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":8195,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":8604,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":9197,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":9669,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":122,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"eg=="}},{"Timestamp":10190,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":10788,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":11244,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":12036,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":122,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"eg=="}},{"Timestamp":12557,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13109,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":13612,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13853,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":14893,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":15324,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":17380,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18036,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18364,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18621,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18908,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":19189,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":20308,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":21452,"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":428,"Mod":0,"Key":256,"Ch":32},{"Timestamp":540,"Mod":0,"Key":256,"Ch":99},{"Timestamp":732,"Mod":0,"Key":256,"Ch":97},{"Timestamp":789,"Mod":0,"Key":256,"Ch":115},{"Timestamp":820,"Mod":0,"Key":256,"Ch":100},{"Timestamp":980,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1445,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1796,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1949,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2037,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2700,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2932,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3612,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3941,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4125,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4348,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4677,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4884,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5364,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5596,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6244,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6532,"Mod":0,"Key":257,"Ch":0},{"Timestamp":6716,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7348,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7588,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8772,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]}
\ No newline at end of file