readme fix for the merge conflict