Update changelog with merged