Vendor files
Conflict cleanup