fixed conflicts in ressource.qrc