There are two options put forth to resolve the conflict which are the "one state solution" and "two state solution".

As for the two states, it is quite easy to understand, but for the one state solution, it is a bit more complex.