clean up merge fail