edited lessons show page
sorted conflicts