added changelog for last merge