deleted conflict files in assets