fix formatting and lesson merge.