Restore chunk lost in git merge error
Merge pull request #2819 from wmtan/RestoreChunkLostInGitMergeError

ROOT6 -- Restore chunk lost in git merge error