synchronize changelog with branch two