updated changelog [#84243402]
fixed merge conflicts