merge ash commits