Agadir land conflict resolved