Delete simple_calculator.txt.u1conflict