Will the Israel and Palestine conflict be solved if both countries became one and each citizen has the same and equal rights ?

Yes, plus Palestinian refugees returning to their lands, and properties they were ethnically cleansed from by Zionists.
It’s an important humanitarian issue.
The whole “conflict” would be solved then, but unfortunately Israel doesn’t want that. It wants maximum lands, minimum Palestinians.