Restore Changelog hunk loss in a prev merge conflict

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>