merging residual things on test branches