Finished Python section
Fixed conflict