Fix change-merged event