CONFLICT tests/bootstrap

Conflict tests/bootstrap