Fix changelog conflicts and remove release dates [ci skip]