Readme added line about resetting a bad merge.