Update README to add conflict in remote