remove the student template
fixing conflicts and merging