Merge branches in school