Update the README for this merge