more reaplaces, conflicts

git-svn-id: file:///srv/repos/svn-packages/svn@218497 eb2447ed-0c53-47e4-bac8-5bc4a241df78