Update the readme, fix the conflict