fix wrong merge
fix wrong merge

northdakota/platform,hugeval/platform,trustify/oroplatform,ramunasd/platform,Djamy/platform,2ndkauboy/platform,Djamy/platform,northdakota/platform,geoffroycochard/platform,morontt/platform,geoffroycochard/platform,trustify/oroplatform,akeneo/platform,ramunasd/platform,geoffroycochard/platform,akeneo/platform,mszajner/platform,umpirsky/platform,morontt/platform,hugeval/platform,mszajner/platform,mszajner/platform,orocrm/platform,northdakota/platform,ramunasd/platform,trustify/oroplatform,orocrm/platform,hugeval/platform,umpirsky/platform,orocrm/platform,2ndkauboy/platform,2ndkauboy/platform,Djamy/platform,akeneo/platform,morontt/platform