teacher resources
conflict fixed