after merge fix

diff --cc README
index 51abbb2be946f9caeb1b5a85a5cb5371338996ee,184f6cfce65c5429c58c49eb08c1ca1f9a0af829..0ef9f40c240c67d9ee3ec77f10bd82669fe20867
--- 1/README
--- 2/README
+++ b/README
@@@ -5,5 -5,5 +5,4 @@@ See doc/build.html for prerequisites an
  Adding a test line
  Adding a second test line
  Adding a third test line
- Adding a fourth test line
 -Adding a 4th test line
 -Adding a fith test line
 +Adding a 5th test line