fetching https://github.com/MoonlightSentinel/dmd.git context/non-root-modules (attempt: 1/3)
From https://github.com/MoonlightSentinel/dmd
 * branch                  context/non-root-modules -> FETCH_HEAD

merging FETCH_HEAD
Auto-merging src/dmd/mars.d
CONFLICT (content): Merge conflict in src/dmd/mars.d
CONFLICT (file location): test/dshell/extra-files/checkaction_context/use_std.d added in d07a44a7d397d82e66c905139395c7d4001b9d90 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/dshell/extra-files/checkaction_context/use_std.d.
CONFLICT (file location): test/dshell/extra-files/checkaction_context/root.d added in d07a44a7d397d82e66c905139395c7d4001b9d90 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/dshell/extra-files/checkaction_context/root.d.
CONFLICT (file location): test/dshell/extra-files/checkaction_context/library.d added in d07a44a7d397d82e66c905139395c7d4001b9d90 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/dshell/extra-files/checkaction_context/library.d.
CONFLICT (file location): test/dshell/extra-files/checkaction_context/issue22700.d added in d07a44a7d397d82e66c905139395c7d4001b9d90 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/dshell/extra-files/checkaction_context/issue22700.d.
CONFLICT (file location): test/dshell/checkaction_context.d added in d07a44a7d397d82e66c905139395c7d4001b9d90 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/dshell/checkaction_context.d.
Auto-merging compiler/src/dmd/id.d
CONFLICT (content): Merge conflict in compiler/src/dmd/id.d
Auto-merging compiler/src/dmd/dtemplate.d
Auto-merging compiler/src/dmd/dmodule.d
CONFLICT (content): Merge conflict in compiler/src/dmd/dmodule.d
Automatic merge failed; fix conflicts and then commit the result.