Fix dodo's failed merging