Daily.sh failed due to merge requirement

  -bash-4.2$ ./scripts/github-remove -d
Are you sure you want to delete all modified and untracked files? [y/N] y
-bash-4.2$ ./daily.sh
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.
Aborting
Updating Composer packages                         OK
Updating SQL-Schema                                OK
Updating submodules                                OK
Cleaning up DB                                     OK
Fetching notifications                             OK
Caching PeeringDB data                             OK