python-pyside: fix conflicting files