deleted files.  Renamed
merge conflict