merge conflict fixed
Added scope to order lessons