Fix merge conflicts with README.md file

7 jobs for development in 23 minutes and 17 seconds (queued for 5 seconds)
Status Name Job ID Coverage
  Lint
passed pattern #18797
regular debian

00:00:43

 
  Build
passed compileUnix #18798
regular debian

00:07:52

passed compileWin #18799
windows

00:20:02

 
  Test
passed testDebian #18800
regular debian

00:01:46

passed testOpensuse #18802
opensuse

00:02:26

passed testUbuntu #18801
ubuntu regular

00:01:50

passed testWin7 #18803
windows

00:00:36