ACADEMY:  merge error fix