Bugfix: removed remaining conflict strings