Helpful exception when reading version information with merge conflict
Attach a file by drag & drop or click to upload
