These two patches fix a misleading message about a directory already existing when doing a merge that needs to modify a read-only file. I will also be sending a script along that can demonstrate the error.