Hamas, Fatah deal on unity government