Fix a merge problem, plus Readme update