Fix diverging conflicts, not sure how this happened but it did
[3501/stronghold-2016] / src / org / usfirst / frc / team3501 /
drwxr-xr-x   ..
drwxr-xr-x - robot