added merge note