Update readme to make note of possible merge conflicts