Elham Shahin and Nadia Al Jundi end disputes