3D files for the "conflict die."
Merge branch 'die'