1 error: encountered diff marker
5 | ^^^^^^^ after this is the code before the merge
11 | ^^^^^^^ above this are the incoming code changes
13 = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
14 = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
15 = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
17 error: aborting due to previous error