deleting conflict files