A solution to the refugees will have to be found as part of any settlement. According to UNRWA they are mainly in 5 locations: Jordan 1,983,733 Lebanon 425,640 Syria 472,109 West Bank 778,993 Gaza Strip 1,106,195 Those in WB & Gaza will have to be dealt with by the PA. Jordan has already given citizenship to most of them, and will absorb the rest as their contribution to peace. So there are something less than a million to be dealt with. Syria will have to pay a price for the Golan. The remaining ones will be offered residence by other countries (Arab/Egypt, US, and Europe).
Israeli troops shoot, injure Palestinian crossing Gaza border fence (Haaretz)