Large number of conflicts reports - but almost all of these seem to have been white-space only

README.md conflict probably not resolved correctly.

Tidying up some files. This seems to have resulted in conflict with master, but I don't know how.