git araxis merge mac

9/27/2020