clean up android donate flow
fix merge conflicts