Merge from school