Delete simple_calculator.py2.u1conflict