looks like changes to the template
conflicts in programming
conflicts in programming
working on programming, rebuilt all courses to get rid of bad merges in output