[DAEF-488] fix conflicts in changelog
[DAEF-488] fix conflicts in changelog

input-output-hk/daedalus,input-output-hk/daedalus,input-output-hk/daedalus,input-output-hk/daedalus,input-output-hk/daedalus,input-output-hk/daedalus