remove conflict strings