conflicts pyqt

