clean up merge