merge conflict, missed updates
merge conflict, missed updates

CredoReference/configuration,Livit/Livit.Learn.EdX.configuration,appsembler/configuration,hastexo/edx-configuration,proversity-org/configuration,Stanford-Online/configuration,stvstnfrd/configuration,pobrejuanito/configuration,hastexo/edx-configuration,usernamenumber/configuration,antoviaque/configuration,hks-epod/configuration,hastexo/edx-configuration,mitodl/configuration,marcore/configuration,lgfa29/configuration,hks-epod/configuration,antoviaque/configuration,marcore/configuration,Livit/Livit.Learn.EdX.configuration,EDUlib/configuration,rue89-tech/configuration,jorgeomarmh/configuration,stvstnfrd/configuration,mitodl/configuration,mitodl/configuration,Livit/Livit.Learn.EdX.configuration,EDUlib/configuration,arbrandes/edx-configuration,eduStack/configuration,rue89-tech/configuration,nunpa/configuration,proversity-org/configuration,gsehub/configuration,jorgeomarmh/configuration,eduStack/configuration,openfun/configuration,edx/configuration,EDUlib/configuration,Livit/Livit.Learn.EdX.configuration,usernamenumber/configuration,armaan/edx-configuration,hks-epod/configuration,Stanford-Online/configuration,edx/configuration,lgfa29/configuration,CredoReference/configuration,hastexo/edx-configuration,antoviaque/configuration,eduStack/configuration,gsehub/configuration,stvstnfrd/configuration,rue89-tech/configuration,edx/configuration,proversity-org/configuration,arbrandes/edx-configuration,usernamenumber/configuration,michaelsteiner19/open-edx-configuration,Stanford-Online/configuration,openfun/configuration,armaan/edx-configuration,proversity-org/configuration,lgfa29/configuration,hastexo/edx-configuration,michaelsteiner19/open-edx-configuration,gsehub/configuration,proversity-org/configuration,marcore/configuration,gsehub/configuration,CredoReference/configuration,EDUlib/configuration,nunpa/configuration,hks-epod/configuration,jorgeomarmh/configuration,openfun/configuration,usernamenumber/configuration,openfun/configuration,open-craft/configuration,Stanford-Online/configuration,hks-epod/configuration,marcore/configuration,rue89-tech/configuration,armaan/edx-configuration,Stanford-Online/configuration,lgfa29/configuration,michaelsteiner19/open-edx-configuration,CredoReference/configuration,gsehub/configuration,pobrejuanito/configuration,jorgeomarmh/configuration,armaan/edx-configuration,pobrejuanito/configuration,open-craft/configuration,michaelsteiner19/open-edx-configuration,open-craft/configuration,mitodl/configuration,stvstnfrd/configuration,stvstnfrd/configuration,rue89-tech/configuration,antoviaque/configuration,open-craft/configuration,edx/configuration,appsembler/configuration,arbrandes/edx-configuration,arbrandes/edx-configuration,arbrandes/edx-configuration,pobrejuanito/configuration,nunpa/configuration,EDUlib/configuration,nunpa/configuration,appsembler/configuration,appsembler/configuration