Nightly: in case of conflicts, add "our" changes on top
Nightly: in case of conflicts, add "our" changes on top

metsma/OpenSC,Jakuje/OpenSC,mouse07410/OpenSC,Jakuje/OpenSC,fabled/OpenSC,Jakuje/OpenSC,OpenSC/OpenSC,fabled/OpenSC,philipWendland/OpenSC,fabled/OpenSC,frankmorgner/OpenSC,LudovicRousseau/OpenSC,LudovicRousseau/OpenSC,mouse07410/OpenSC,dengert/OpenSC,mouse07410/OpenSC,philipWendland/OpenSC,frankmorgner/OpenSC,frankmorgner/OpenSC,metsma/OpenSC,philipWendland/OpenSC,dengert/OpenSC,dengert/OpenSC,metsma/OpenSC,LudovicRousseau/OpenSC,frankmorgner/OpenSC,fabled/OpenSC,Jakuje/OpenSC,OpenSC/OpenSC,OpenSC/OpenSC