debugging air Brewfile, verified working
resolve merge conflicts