Yeah, quite likely on both parts, but the world has tried a one state solution the status quo (I've been corrected, current situation is not called one state) for how many decades now and we're seeing the results of that. Rather they try setting up an independent Palestine and working with the issues that come from that than just keep the genocide going.
Two state, interim UN appointed government, transition to Palestinian elected leadership maybe?. Easier said than done for sure but going down the current path is well... Not going great