Deleted conflict files
Need to make the v3.0 branch master