Fix handling of duplicate files.
Fix handling of duplicate files.

btrask/stronglink,nkatsaros/stronglink,Lacra17/stronglink,guiquanz/stronglink,yamingd/stronglink,yamingd/stronglink,nkatsaros/stronglink,rmoorman/stronglink,nkatsaros/stronglink,guiquanz/stronglink,iOSCowboy/stronglink,btrask/stronglink,Ryezhang/stronglink,Lacra17/stronglink,feld/stronglink,feld/stronglink,rmoorman/stronglink,iOSCowboy/stronglink,Ryezhang/stronglink,Ryezhang/stronglink,shaunstanislaus/stronglink,feld/stronglink,guiquanz/stronglink,shaunstanislaus/stronglink,Lacra17/stronglink,shaunstanislaus/stronglink,yamingd/stronglink,iOSCowboy/stronglink,btrask/stronglink,btrask/stronglink,rmoorman/stronglink