Resolved merge for class exercise