Working on new pivot
Fixed merge error