added merge to change log