Fixed readme after thousands of failed conflict fixing attempts.