Fixed course dates.
Fixed merge conflict.