upload courses image
merge conflict
one more merge
css merge conf