Azerbaijan, Armenia discuss Upper Karabakh conflict