Prime Minister Ehud Olmert has said that if Lebanon fulfilled its obligations under the United Nations resolution that ended the fighting -- including the disarming of Hezbollah -- then Israel would be willing to discuss Shabaa Farms .