remove conflict data