fetching https://github.com/TurkeyMan/druntime.git std_optional (attempt: 1/3)
From https://github.com/TurkeyMan/druntime
 * branch                std_optional -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (file location): test/stdcpp/src/optional_test.d added in 73309606db15890273927076f8f4ff636ad35d63 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/test/stdcpp/src/optional_test.d.
CONFLICT (file location): test/stdcpp/src/optional.cpp added in 73309606db15890273927076f8f4ff636ad35d63 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/test/stdcpp/src/optional.cpp.
Auto-merging old/mak/SRCS
Auto-merging old/mak/DOCS
Auto-merging old/mak/COPY
CONFLICT (file location): changelog/std_optional.dd added in 73309606db15890273927076f8f4ff636ad35d63 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/changelog/std_optional.dd.
Automatic merge failed; fix conflicts and then commit the result.