merge with teachers comments