2nd general try
I hope I hope
Hoping again
merge maybe?
Can Ken merge ?
Fixed merge confilcts