Update ReadMe to fix conflicts