Deleted conflict files