fetching https://github.com/dkorpel/dmd.git package-dir-and-file (attempt: 1/3) From https://github.com/dkorpel/dmd * branch package-dir-and-file -> FETCH_HEAD merging FETCH_HEAD Auto-merging compiler/src/dmd/file_manager.d CONFLICT (content): Merge conflict in compiler/src/dmd/file_manager.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.