finish flow, now to clean up merge