1.3)
Merge now → Now merge
end with a conflicts → end with a conflict

1.4)
resolved until → resolved before
Edit the merge conflict → Edit the conflicting file
with the change → with the changes
As with 26), it’s probably a good idea to tell the user to leave the default commit message alone

1.5)
with with → with
he same can → the same can