Can you revert the reordering of the use statements? That makes merging between branches a nightmare.