fetching https://github.com/ibuclaw/dmd.git mvresolve (attempt: 1/3)
From https://github.com/ibuclaw/dmd
 * branch                  mvresolve  -> FETCH_HEAD

merging FETCH_HEAD
Auto-merging compiler/src/dmd/typesem.d
CONFLICT (content): Merge conflict in compiler/src/dmd/typesem.d
Auto-merging compiler/src/dmd/traits.d
Auto-merging compiler/src/dmd/templateparamsem.d
Auto-merging compiler/src/dmd/mtype.d
Auto-merging compiler/src/dmd/expressionsem.d
CONFLICT (content): Merge conflict in compiler/src/dmd/expressionsem.d
Auto-merging compiler/src/dmd/dtemplate.d
Auto-merging compiler/src/dmd/dsymbolsem.d
Auto-merging compiler/src/build.d
Automatic merge failed; fix conflicts and then commit the result.