fix merge conflict error
fix merge conflict error

sejalkhatri/WikiEduDashboard,sejalkhatri/WikiEduDashboard,majakomel/WikiEduDashboard,WinnySilva/WikiEduDashboard,MusikAnimal/WikiEduDashboard,majakomel/WikiEduDashboard,KarmaHater/WikiEduDashboard,WinnySilva/WikiEduDashboard,sejalkhatri/WikiEduDashboard,WikiEducationFoundation/WikiEduDashboard,MusikAnimal/WikiEduDashboard,ragesoss/WikiEduDashboard,WikiEducationFoundation/WikiEduDashboard,adamwight/WikiEduDashboard,majakomel/WikiEduDashboard,feelfreelinux/WikiEduDashboard,majakomel/WikiEduDashboard,Wowu/WikiEduDashboard,sejalkhatri/WikiEduDashboard,KarmaHater/WikiEduDashboard,KarmaHater/WikiEduDashboard,Wowu/WikiEduDashboard,alpha721/WikiEduDashboard,KarmaHater/WikiEduDashboard,sejalkhatri/WikiEduDashboard,MusikAnimal/WikiEduDashboard,ragesoss/WikiEduDashboard,WikiEducationFoundation/WikiEduDashboard,alpha721/WikiEduDashboard,Wowu/WikiEduDashboard,WikiEducationFoundation/WikiEduDashboard,adamwight/WikiEduDashboard,MusikAnimal/WikiEduDashboard,alpha721/WikiEduDashboard,WinnySilva/WikiEduDashboard,feelfreelinux/WikiEduDashboard,ragesoss/WikiEduDashboard,alpha721/WikiEduDashboard,adamwight/WikiEduDashboard,feelfreelinux/WikiEduDashboard,feelfreelinux/WikiEduDashboard,WikiEducationFoundation/WikiEduDashboard,Wowu/WikiEduDashboard