Updating forgotten unmerged conflicts
Some changelog updates