Added last merge to changelog