merge with teachers solution