updating notes on merge