CONFLICT tests/bootstrap file

Conflict tests/bootstrap file.