Removed conflict file
Removed python bytecode file