delete a.out
fix conflict
add couple files in python