Got it...And what a bloody nightmare
All the blocks of text about changed and conflict files were saying to do stuff, merge etc but there were no options. Downloaded the modified files archive which contained one file, which I never modified! Uploaded it anyway, rechecked files and still said there were differences. No options anywhere to merge etc.
Updated and now the site looks like crap!
http://www.testphpbb.co.uk