Now we may have people editing the page files to customise them we need to think about how to make upgrades as painless as possible. The issues is the need to merge possibly conflicting user changes with upgrade changes

Something like WP child themes may work.