update cg content exercise
fixed merge conflict