Remove conflicting python files

Conflicting python files are now default in 1.6 instead of just in HEAD.