remove wrong lines from merging

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>