Update notes in README re. handling conflicts