remove conflict temp file