repair / re-merge files