merge
merge
improved gradient, no div by 0