resolve confilit

Signed-off-by: Blaise Fonseca <blaisefonseca@hotmail.com>
show CPC amendment history

Signed-off-by: Blaise Fonseca <blaisefonseca@hotmail.com>