COMP: remove conflict text