committed changes from code factoring by student developer
merged conflict