Conflicts Counted, Semesters Merged

Conflicts are now being counted at runtime.
There is now data for merged semester classes.