Fix merge changelog