Fixed changelog merge conflicts

Signed-off-by: fhenry <felix.henry@sopra.com>