deleted conflict files, etc