thumb drive corruption
fix merge conflicts