Deleting conflicted files