Unable to merge latest spec repo changes

[sbc100]

When trying to run update-tests.sh in https://github.com/WebAssembly/testsuite the memory64 tests could not be updated to do unresolved conflicts merging spec/master.

Please merge the latest upstream changes to resolve these conflicts:

>> git reset origin/master --hard
HEAD is now at 318622f0 [test] Add more lexing tests (#9)
>> git merge -q spec/master -m merged
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging document/core/appendix/custom.rst
Auto-merging document/core/util/macros.def
Auto-merging interpreter/Makefile
CONFLICT (content): Merge conflict in interpreter/Makefile
Auto-merging interpreter/text/lexer.mll
CONFLICT (content): Merge conflict in interpreter/text/lexer.mll
Automatic merge failed; fix conflicts and then commit the result.
>> git checkout --ours document interpreter test/harness
Updated 2 paths from the index
>> git add document interpreter test/harness
>> git -c core.editor=true merge --continue
U   README.md
error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
!! error merging annotations, skipping

[sbc100]

Actually from the POV of the testsuite repo we should be ignoring the conflict in README.md so this issue is not urgent.

[rossberg]

Fixed by merging upstream and resolving conflicts.