Fix a few mixtures in the readme, add a note about the crude conflict resolution