fixing bad merge conflict
fixing bad merge conflict

antshin72/configuration,Unow/configuration,4eek/configuration,eduStack/configuration,nttks/configuration,antoviaque/configuration,lgfa29/configuration,openfun/configuration,michaelsteiner19/open-edx-configuration,proversity-org/configuration,rue89-tech/configuration,LearnEra/LearnEra-Configuration,marcore/configuration,mitodl/configuration,arifsetiawan/configuration,pobrejuanito/configuration,leansoft/configuration,chenshuchuan/configuration,openfun/configuration,antshin72/configuration,chudaol/configuration,open-craft/configuration,gashac03/ubuntu,Livit/Livit.Learn.EdX.configuration,proversity-org/configuration,fghaas/edx-configuration,chudaol/configuration,fghaas/edx-configuration,pobrejuanito/configuration,Carlos2005/configuration,usernamenumber/configuration,hks-epod/configuration,hastexo/edx-configuration,chenshuchuan/configuration,cyanna/configuration,arbrandes/edx-configuration,jorgeomarmh/configuration,pedrorib/istx,eduStack/configuration,alu042/configuration,IONISx/edx-configuration,bugcy013/edx_infra,yrchen/configuration,gsehub/configuration,jp-bpl/configuration,glengal/configuration,kmoocdev/configuration,EDUlib/configuration,alu042/configuration,gsehub/configuration,kencung/configuration,louyihua/configuration,LearnEra/LearnEra-Configuration,zhengjunwei/configuration,stvstnfrd/configuration,UXE/edx-configuration,kursitet/configuration,kmoocdev/configuration,hastexo/edx-configuration,xiangjf/configuration,zhengjunwei/configuration,Pieros/configuration,stvstnfrd/configuration,vasyarv/configuration,armaan/edx-configuration,hastexo/edx-configuration,joshhu/configuration,kursitet/configuration,negritobomb/edxplat,Livit/Livit.Learn.EdX.configuration,rue89-tech/configuration,nttks/configuration,fghaas/edx-configuration,UXE/edx-configuration,nikolas/configuration,vasyarv/configuration,nikolas/configuration,negritobomb/edxplat,michaelsteiner19/open-edx-configuration,edx/configuration,knehez/configuration,glengal/configuration,bugcy013/edx_infra,Softmotions/configuration,negritobomb/edxplat,sudheerchintala/LearnEra-Configuration,joshhu/configuration,joshhu/configuration,knehez/configuration,Livit/Livit.Learn.EdX.configuration,michaelsteiner19/open-edx-configuration,IONISx/edx-configuration,4eek/configuration,usernamenumber/configuration,nttks/configuration,hmcmooc/ec2-edx-configuration,xiangjf/configuration,louyihua/configuration,usernamenumber/configuration,hastexo/edx-configuration,yrchen/configuration,cecep-edu/configuration,nunpa/configuration,jorgeomarmh/configuration,leansoft/configuration,louyihua/configuration,4eek/configuration,fghaas/edx-configuration,Stanford-Online/configuration,IndonesiaX/configuration,kursitet/configuration,hks-epod/configuration,cyanna/configuration,Softmotions/configuration,gsehub/configuration,arbrandes/edx-configuration,arifsetiawan/configuration,antoviaque/configuration,hastexo/edx-configuration,Carlos2005/configuration,jp-bpl/configuration,negritobomb/edxplat,Pieros/configuration,CredoReference/configuration,UXE/edx-configuration,stvstnfrd/configuration,lgfa29/configuration,leansoft/configuration,cyanna/configuration,lgfa29/configuration,antoviaque/configuration,appsembler/configuration,proversity-org/configuration,EDUlib/configuration,knehez/configuration,Softmotions/configuration,arbrandes/edx-configuration,michaelsteiner19/open-edx-configuration,gashac03/ubuntu,arifsetiawan/configuration,Stanford-Online/configuration,CredoReference/configuration,appsembler/configuration,arifsetiawan/configuration,nunpa/configuration,mitodl/configuration,IONISx/edx-configuration,eduStack/configuration,knehez/configuration,LearnEra/LearnEra-Configuration,cecep-edu/configuration,stvstnfrd/configuration,yrchen/configuration,pedrorib/istx,stvstnfrd/configuration,openfun/configuration,bugcy013/edx_infra,antshin72/configuration,EDUlib/configuration,chudaol/configuration,CredoReference/configuration,jp-bpl/configuration,chudaol/configuration,mitodl/configuration,glengal/configuration,Carlos2005/configuration,antshin72/configuration,omarkhan/configuration,cyanna/configuration,glengal/configuration,open-craft/configuration,jp-bpl/configuration,AlfiyaZi/configuration,alu042/configuration,gsehub/configuration,hks-epod/configuration,edx/configuration,AlfiyaZi/configuration,armaan/edx-configuration,Stanford-Online/configuration,UXE/edx-configuration,alu042/configuration,leansoft/configuration,hastexo/edx-configuration-old,vasyarv/configuration,hks-epod/configuration,Livit/Livit.Learn.EdX.configuration,Pieros/configuration,zhengjunwei/configuration,xiangjf/configuration,gsehub/configuration,Stanford-Online/configuration,arbrandes/edx-configuration,usernamenumber/configuration,antoviaque/configuration,IndonesiaX/configuration,proversity-org/configuration,4eek/configuration,beacloudgenius/configuration,omarkhan/configuration,open-craft/configuration,appsembler/configuration,mitodl/configuration,marcore/configuration,beacloudgenius/configuration,EDUlib/configuration,cecep-edu/configuration,louyihua/configuration,pedrorib/istx,gashac03/ubuntu,IndonesiaX/configuration,B-MOOC/configuration,B-MOOC/configuration,jorgeomarmh/configuration,omarkhan/configuration,joshhu/configuration,nikolas/configuration,kmoocdev/configuration,edx/configuration,nikolas/configuration,proversity-org/configuration,openfun/configuration,rue89-tech/configuration,Softmotions/configuration,sudheerchintala/LearnEra-Configuration,hastexo/edx-configuration-old,jp-bpl/configuration,edx/configuration,IONISx/edx-configuration,omarkhan/configuration,nunpa/configuration,pobrejuanito/configuration,pobrejuanito/configuration,yrchen/configuration,nttks/configuration,hastexo/edx-configuration-old,arbrandes/edx-configuration,kencung/configuration,open-craft/configuration,IndonesiaX/configuration,appsembler/configuration,Unow/configuration,pedrorib/istx,hastexo/edx-configuration-old,Pieros/configuration,hmcmooc/ec2-edx-configuration,bugcy013/edx_infra,hks-epod/configuration,marcore/configuration,Stanford-Online/configuration,Unow/configuration,sudheerchintala/LearnEra-Configuration,chenshuchuan/configuration,AlfiyaZi/configuration,vasyarv/configuration,armaan/edx-configuration,CredoReference/configuration,jorgeomarmh/configuration,gashac03/ubuntu,zhengjunwei/configuration,EDUlib/configuration,rue89-tech/configuration,nunpa/configuration,marcore/configuration,B-MOOC/configuration,kursitet/configuration,kencung/configuration,armaan/edx-configuration,lgfa29/configuration,xiangjf/configuration,Carlos2005/configuration,beacloudgenius/configuration,rue89-tech/configuration,hmcmooc/ec2-edx-configuration,kmoocdev/configuration,kencung/configuration,beacloudgenius/configuration,AlfiyaZi/configuration