EDMONTON - The Alberta-British Columbia wine fight appears to be coming to an end.