merged changelog