Changes to dimensions; no more Github for Mac
Mapping for conflict chunks