Disputes between Yusra and Laila Elwi resolved