update change log
Merge branch 'comp'