fix up merge
fix up merge
fix tests