Thanks Murrant
I still get this error message
Updating to latest codebase FAIL
error: The following untracked working tree files would be overwritten by merge:
config/hashing.php
config/logging.php
config/tinker.php
Please move or remove them before you can merge.