Fix merge conflicts with README.md file

7 jobs for development in 23 minutes and 17 seconds (queued for 5 seconds)