remove conflicts files;