finish up merge