Resolved conflict
Updated course program
Added todo on failing test