These are the files that need to be modified in order to get clone command to work. More files need to be corrected for merge to work, but this should be the start. Only File.java is modified, but may need to be modified again.