putting back files lost due to bad merge