notes on merge conflicts