Costly BA dispute finally nears end